fix: unit tests

Author: vasil-cf

lib/http-server/index.ts

@@ -4,6 +4,8 @@ import fastify from 'fastify';
 import cfLogs from 'cf-logs';
 
 import { saveServerAddress } from '../helpers';
+
+// eslint-disable-next-line import/no-unresolved
 import deprecatedImagesCollector from '../metric/deprecated-images/deprecated-images.collector';
 
 const logger = cfLogs.Logger('codefresh:containerLogger');

package.json

@@ -47,9 +47,9 @@
     "node": ">=16.20.2 <=20"
   },
   "scripts": {
-    "lint": "eslint '*/**/*.js'",
-    "lint-fix": "eslint '*/**/*.js' --fix",
-    "test": "node ./node_modules/mocha/bin/_mocha './{,!(node_modules)/**/}*.spec.js' --exit",
+    "lint": "eslint '*/**/*.{j,t}s'",
+    "lint-fix": "eslint '*/**/*.{j,t}s' --fix",
+    "test": "node ./node_modules/mocha/bin/_mocha --require ts-node/register 'test/**/*.spec.js' --exit",
     "test:ci": "yarn test",
     "start": "node dist/index.js",
     "version": "exit 0",

test/logger.unit.spec.js

@@ -14,10 +14,12 @@ chai.use(sinonChai);
 
 const mockAddress = 'mockAddress';
 const stubFastifyPost = sinon.stub();
+const stubFastifyGet = sinon.stub();
 const stubFastifyListen = sinon.stub().resolves(mockAddress);
 const stubFastify = sinon.stub().returns({
     listen: stubFastifyListen,
     post: stubFastifyPost,
+    get: stubFastifyGet,
 });
 const stubSaveServerAddress = sinon.stub().resolves();
 
@@ -1696,11 +1698,17 @@ describe('Logger tests', () => {
             };
             const TaskLoggerFactory = sinon.spy(async () => taskLogger);
 
+            const HttpServer = proxyquire('../lib/http-server', {
+                'fastify': stubFastify,
+                '../helpers': {
+                    saveServerAddress: stubSaveServerAddress,
+                }
+            });
+
             const Logger = proxyquire('../lib/logger', {
                 '@codefresh-io/task-logger': { TaskLogger: TaskLoggerFactory },
-                'fastify': stubFastify,
+                './http-server': HttpServer,
                 './helpers': {
-                    saveServerAddress: stubSaveServerAddress,
                     getPromiseWithResolvers,
                 },
             });
@@ -1709,6 +1717,8 @@ describe('Logger tests', () => {
             const taskLoggerConfig = { task: {}, opts: {} };
             const findExistingContainers = false;
 
+            process.env.PORT = 1337;
+            process.env.HOST = '127.0.0.1';
             const logger = new Logger({
                 loggerId,
                 taskLoggerConfig,
@@ -1717,8 +1727,6 @@ describe('Logger tests', () => {
             logger._listenForNewContainers = sinon.spy();
             logger._writeNewState = sinon.spy();
             logger._listenForExistingContainers = sinon.spy();
-            process.env.PORT = 1337;
-            process.env.HOST = '127.0.0.1';
             await logger.start();
 
             expect(stubFastify).to.have.been.calledOnce;
@@ -1739,9 +1747,13 @@ describe('Logger tests', () => {
             };
             const TaskLoggerFactory = sinon.spy(async () => taskLogger);
 
+            const HttpServer = proxyquire('../lib/http-server', {
+                'fastify': stubFastify,
+            });
+
             const Logger = proxyquire('../lib/logger', {
                 '@codefresh-io/task-logger': { TaskLogger: TaskLoggerFactory },
-                'fastify': stubFastify,
+                './http-server': HttpServer,
                 './helpers': {
                     saveServerAddress: stubSaveServerAddress,
                     getPromiseWithResolvers,

tsconfig.json

@@ -25,9 +25,9 @@
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
 
     /* Modules */
-    "module": "commonjs",                                /* Specify what module code is generated. */
+    "module": "node16",                                /* Specify what module code is generated. */
     "rootDir": "./lib",                                  /* Specify the root folder within your source files. */
-    // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
+    "moduleResolution": "node16",                     /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */