Skip to content

1487 backend test fixes #1876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trillium merged 9 commits into from
Mar 19, 2025
Merged

1487 backend test fixes #1876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c12641b
Fix source of infinite regression in model tests
dannyprikaz Mar 19, 2025
d1a996e
Import actual methods to fix tests
dannyprikaz Mar 19, 2025
3751aed
Mock resolved value of fetch to prevent error logs
dannyprikaz Mar 19, 2025
65c453f
Unskip test of auth.config.js
dannyprikaz Mar 19, 2025
0fd867e
Remove test command for client-mvp to fix test:all
dannyprikaz Mar 19, 2025
2fb8537
Remove cypress tests from run test:all
dannyprikaz Mar 19, 2025
fc8946a
Readjust whitespace
dannyprikaz Mar 19, 2025
7ce07a4
Re-skip auth.config.test in case env vars aren't set up
dannyprikaz Mar 19, 2025
0ab8dd0
Merge branch 'development' into 1487-backend-test-fixes
trillium Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions backend/models/project.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
4 changes: 1 addition & 3 deletions backend/models/user.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", () => {
Expand Down
7 changes: 6 additions & 1 deletion backend/workers/createRecurringEvents.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const {
filterAndCreateEvents,
runTask,
scheduleTask,
} = require('./createRecurringEvents');
} = jest.requireActual('./createRecurringEvents');
const { generateEventData } = require('./lib/generateEventData');

const MockDate = require('mockdate');
Expand All @@ -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');

Expand Down
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Member

@trillium trillium Mar 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Writing for clarity here that we're removing test:client-mvp and test:cy

},
"dependencies": {
"@mui/icons-material": "^5.14.19",
Expand Down
Loading