From 46f2b7a3f8e7fc261e3a7b8174f77a41b33b78cd Mon Sep 17 00:00:00 2001 From: Aashish-Upadhyay-101 Date: Thu, 16 Mar 2023 17:34:11 +0545 Subject: [PATCH 1/4] test setup --- backend/jest.config.ts | 9 +++++++++ backend/package.json | 11 ----------- backend/setupTests.ts | 11 +++++++++++ backend/{__tests__ => tests}/healthcheck.test.ts | 0 4 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 backend/jest.config.ts create mode 100644 backend/setupTests.ts rename backend/{__tests__ => tests}/healthcheck.test.ts (100%) diff --git a/backend/jest.config.ts b/backend/jest.config.ts new file mode 100644 index 000000000..b7ca988db --- /dev/null +++ b/backend/jest.config.ts @@ -0,0 +1,9 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + collectCoverageFrom: ['src/*.{js,ts}', '!**/node_modules/**'], + modulePaths: ['/src'], + testMatch: ['/tests/**/*.test.ts'], + setupFiles: ['/test-resources/env-vars.js'], + setupFilesAfterEnv: ['/setupTests.ts'] +}; diff --git a/backend/package.json b/backend/package.json index cd6cd214a..f24ef80fa 100644 --- a/backend/package.json +++ b/backend/package.json @@ -101,17 +101,6 @@ "ts-jest": "^29.0.3", "ts-node": "^10.9.1" }, - "jest": { - "preset": "ts-jest", - "testEnvironment": "node", - "collectCoverageFrom": [ - "src/*.{js,ts}", - "!**/node_modules/**" - ], - "setupFiles": [ - "/test-resources/env-vars.js" - ] - }, "jest-junit": { "outputDirectory": "reports", "outputName": "jest-junit.xml", diff --git a/backend/setupTests.ts b/backend/setupTests.ts new file mode 100644 index 000000000..c98a366f9 --- /dev/null +++ b/backend/setupTests.ts @@ -0,0 +1,11 @@ +import { beforeAll, afterAll } from '@jest/globals'; +import { DatabaseService } from './src/services'; + +beforeAll(async () => { + const mongoURL = process.env.MONGO_URL!; + await DatabaseService.initDatabase(mongoURL); +}); + +afterAll(async () => { + await DatabaseService.closeDatabase(); +}); diff --git a/backend/__tests__/healthcheck.test.ts b/backend/tests/healthcheck.test.ts similarity index 100% rename from backend/__tests__/healthcheck.test.ts rename to backend/tests/healthcheck.test.ts From ded5c50157463af0ba2a562f95c4345d6237a358 Mon Sep 17 00:00:00 2001 From: Aashish-Upadhyay-101 Date: Thu, 16 Mar 2023 17:36:49 +0545 Subject: [PATCH 2/4] setup done ! --- backend/tests/healthcheck.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/tests/healthcheck.test.ts b/backend/tests/healthcheck.test.ts index e054bd180..903347a2a 100644 --- a/backend/tests/healthcheck.test.ts +++ b/backend/tests/healthcheck.test.ts @@ -18,4 +18,4 @@ describe('Healthcheck endpoint', () => { const res = await request(server).get('/healthcheck'); expect(res.status).toEqual(200); }); -}); \ No newline at end of file +}); From 87c99df13d76edb76cdd1c8b1a83b67dd3d1f8f5 Mon Sep 17 00:00:00 2001 From: Aashish-Upadhyay-101 Date: Fri, 17 Mar 2023 15:50:22 +0545 Subject: [PATCH 3/4] jest test basic setup --- backend/jest.config.ts | 2 +- backend/setupTests.ts | 11 ----------- backend/tests/{healthcheck.test.ts => setupTests.ts} | 0 3 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 backend/setupTests.ts rename backend/tests/{healthcheck.test.ts => setupTests.ts} (100%) diff --git a/backend/jest.config.ts b/backend/jest.config.ts index b7ca988db..8a72ad84c 100644 --- a/backend/jest.config.ts +++ b/backend/jest.config.ts @@ -5,5 +5,5 @@ export default { modulePaths: ['/src'], testMatch: ['/tests/**/*.test.ts'], setupFiles: ['/test-resources/env-vars.js'], - setupFilesAfterEnv: ['/setupTests.ts'] + setupFilesAfterEnv: ['/tests/setupTests.ts'] }; diff --git a/backend/setupTests.ts b/backend/setupTests.ts deleted file mode 100644 index c98a366f9..000000000 --- a/backend/setupTests.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { beforeAll, afterAll } from '@jest/globals'; -import { DatabaseService } from './src/services'; - -beforeAll(async () => { - const mongoURL = process.env.MONGO_URL!; - await DatabaseService.initDatabase(mongoURL); -}); - -afterAll(async () => { - await DatabaseService.closeDatabase(); -}); diff --git a/backend/tests/healthcheck.test.ts b/backend/tests/setupTests.ts similarity index 100% rename from backend/tests/healthcheck.test.ts rename to backend/tests/setupTests.ts From 9e8e538647c7c498bbd65686d083c7a69d6a7867 Mon Sep 17 00:00:00 2001 From: Aashish-Upadhyay-101 Date: Sat, 18 Mar 2023 12:27:06 +0545 Subject: [PATCH 4/4] example test to resolve CI fail --- backend/tests/example.test.ts | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 backend/tests/example.test.ts diff --git a/backend/tests/example.test.ts b/backend/tests/example.test.ts new file mode 100644 index 000000000..6d38025a5 --- /dev/null +++ b/backend/tests/example.test.ts @@ -0,0 +1,5 @@ +import { it, expect } from '@jest/globals'; + +it('should return true', () => { + expect(true).toBeTruthy(); +});