diff --git a/backend/models/project.test.js b/backend/models/project.test.js index 0f00cdc7c..3dba0521d 100644 --- a/backend/models/project.test.js +++ b/backend/models/project.test.js @@ -2,9 +2,7 @@ const { Project } = require('./project.model'); const { setupDB } = require("../setup-test"); -beforeAll(async () => { - await setupDB("user-model"); -}); +setupDB("user-model"); describe("Project Model saves the correct values", () => { test("Save a model instance and then read from the db", async (done) => { diff --git a/backend/models/user.test.js b/backend/models/user.test.js index e2325f0bd..acce39ae1 100644 --- a/backend/models/user.test.js +++ b/backend/models/user.test.js @@ -2,9 +2,7 @@ const { User } = require('./user.model'); const { setupDB } = require("../setup-test"); -beforeAll(async () => { - await setupDB("user-model"); -}); +setupDB("user-model"); // Please add and expand on this simple test. describe("Question Model saves the correct values", () => { diff --git a/backend/workers/createRecurringEvents.test.js b/backend/workers/createRecurringEvents.test.js index 56360ad1f..479a8d969 100644 --- a/backend/workers/createRecurringEvents.test.js +++ b/backend/workers/createRecurringEvents.test.js @@ -7,7 +7,7 @@ const { filterAndCreateEvents, runTask, scheduleTask, -} = require('./createRecurringEvents'); +} = jest.requireActual('./createRecurringEvents'); const { generateEventData } = require('./lib/generateEventData'); const MockDate = require('mockdate'); @@ -29,6 +29,11 @@ describe('createRecurringEvents Module Tests', () => { let mockEvents; let mockRecurringEvents; + fetch.mockResolvedValue({ + ok: true, + json: jest.fn().mockResolvedValue(mockEvents), + }); + beforeEach(() => { MockDate.set('2023-11-02T00:00:00Z'); diff --git a/package.json b/package.json index 1030d6958..ff99fe8dd 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,7 @@ "test:cy": "dotenv -e ./backend/.env -e ./client/.env cross-var start-test dev:api %BACKEND_PORT% dev:client %CLIENT_PORT% cy:run", "test:backend": "cd backend && npm run test", "test:client": "cd client && npm run test", - "test:client-mvp": "cd client-mvp-04 && npm run test", - "test:all": "cross-env NODE_ENV=test npm run test:client && npm run test:client-mvp && npm run test:backend && npm run test:cy" + "test:all": "cross-env NODE_ENV=test npm run test:client && npm run test:backend" }, "dependencies": { "@mui/icons-material": "^5.14.19",