Skip to content

Commit bfea840

Browse files
committed
Remove global test-teardown and inline db-disconnection
This fixes tests not exiting properly
1 parent 0ee9f91 commit bfea840

File tree

9 files changed

+792
-519
lines changed

9 files changed

+792
-519
lines changed

jest.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
module.exports = {
22
setupFilesAfterEnv: ['jest-extended'],
3-
globalTeardown: './tests/teardown.ts',
43
transform: {'\.ts$': 'ts-jest'},
54
moduleFileExtensions: ['ts', 'js', 'json'],
65
testTimeout: 50000

package-lock.json

Lines changed: 776 additions & 505 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@
3434
"@types/qrcode": "^1.3.5",
3535
"@types/supertest": "^2.0.10",
3636
"@types/validator": "^13.1.0",
37-
"@typescript-eslint/eslint-plugin": "^3.8.0",
38-
"@typescript-eslint/parser": "^3.8.0",
37+
"@typescript-eslint/eslint-plugin": "^3.9.0",
38+
"@typescript-eslint/parser": "^3.9.0",
3939
"eslint": "^7.6.0",
4040
"eslint-config-simon": "^2.1.0",
41-
"jest": "^26.2.2",
41+
"jest": "^26.4.0",
4242
"jest-extended": "^0.11.5",
4343
"node-fetch": "^2.6.0",
4444
"supertest": "^4.0.2",
45-
"ts-jest": "^26.1.4",
46-
"ts-node-dev": "^1.0.0-pre.56"
45+
"ts-jest": "^26.2.0",
46+
"ts-node-dev": "^1.0.0-pre.57"
4747
},
4848
"dependencies": {
4949
"@prisma/client": "^2.4.1",

tests/endpoints/DeleteUser.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {db} from '../../src/db';
66

77
let token: string | null = null;
88

9+
afterAll(() => db.$disconnect());
910
beforeAll(async () => {
1011

1112
// Login using the admin account

tests/endpoints/GetUserStats.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ import 'jest-extended';
22
import request from 'supertest';
33
import {app} from '../../src';
44
import {Status} from '../../src/api/enums/Status';
5+
import {db} from '../../src/db';
56

67
let token: string | null = null;
78

9+
afterAll(() => db.$disconnect());
810
beforeAll(async () => {
911

1012
// Login using the admin account

tests/endpoints/PatchUser.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ afterAll(async () => {
2222
await db.user.deleteMany({
2323
where: {username: {in: ['mori.noma']}}
2424
});
25+
26+
db.$disconnect();
2527
});
2628

2729
describe('PATCH /api/users', () => {

tests/endpoints/PostLogin.test.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ const resetLoginAttempts = async () => await db.web_login_attempt.deleteMany({
1717

1818
// Reset login attempts before and after all tests
1919
beforeAll(resetLoginAttempts);
20-
afterAll(resetLoginAttempts);
20+
afterAll(async () => {
21+
await resetLoginAttempts();
22+
await db.$disconnect();
23+
});
2124

2225
describe('POST /api/login', () => {
2326
it('Should return an error if the payload is invalid', async () => {

tests/endpoints/PutUser.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ afterAll(async () => {
2424
await db.user.delete({
2525
where: {username: 'foobar'}
2626
});
27+
28+
await db.$disconnect();
2729
});
2830

2931
describe('PUT /api/users', () => {

tests/teardown.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)