Skip to content

Commit 4c6122d

Browse files
committed
restructure test files
1 parent 1eb0fcd commit 4c6122d

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

tests/routes/v1/login/integration.test.ts renamed to tests/routes/v1/access/login/integration.test.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
jest.resetAllMocks(); // make sure we do not have any mocks set from unit tests
22

33
import supertest from 'supertest';
4-
import app from '../../../../src/app';
5-
import UserRepo from '../../../../src/database/repository/UserRepo';
6-
import KeystoreRepo from '../../../../src/database/repository/KeystoreRepo';
7-
import User, { UserModel } from '../../../../src/database/model/User';
4+
import app from '../../../../../src/app';
5+
import UserRepo from '../../../../../src/database/repository/UserRepo';
6+
import KeystoreRepo from '../../../../../src/database/repository/KeystoreRepo';
7+
import User, { UserModel } from '../../../../../src/database/model/User';
88
import bcrypt from 'bcrypt';
9-
import * as authUtils from '../../../../src/auth/authUtils';
10-
import Role, { RoleCode } from '../../../../src/database/model/Role';
9+
import * as authUtils from '../../../../../src/auth/authUtils';
10+
import Role, { RoleCode } from '../../../../../src/database/model/Role';
1111
import { Types } from 'mongoose';
12-
import ApiKey, { ApiKeyModel } from '../../../../src/database/model/ApiKey';
13-
import { connection } from '../../../../src/database';
14-
import cache from '../../../../src/cache';
12+
import ApiKey, { ApiKeyModel } from '../../../../../src/database/model/ApiKey';
13+
import { connection } from '../../../../../src/database';
14+
import cache from '../../../../../src/cache';
1515

1616
export const createTokensSpy = jest.spyOn(authUtils, 'createTokens');
1717
export const bcryptCompareSpy = jest.spyOn(bcrypt, 'compare');

tests/routes/v1/login/mock.ts renamed to tests/routes/v1/access/login/mock.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { USER_ID } from '../../../auth/authentication/mock';
2-
import Keystore from '../../../../src/database/model/Keystore';
3-
import User from '../../../../src/database/model/User';
1+
import { USER_ID } from '../../../../auth/authentication/mock';
2+
import Keystore from '../../../../../src/database/model/Keystore';
3+
import User from '../../../../../src/database/model/User';
44
import { Types } from 'mongoose';
55
import bcrypt from 'bcrypt';
6-
import * as authUtils from '../../../../src/auth/authUtils';
7-
import Role from '../../../../src/database/model/Role';
6+
import * as authUtils from '../../../../../src/auth/authUtils';
7+
import Role from '../../../../../src/database/model/Role';
88

99
export const USER_EMAIL = 'random@test.com';
1010
export const USER_PASSWORD = 'abc123';
@@ -38,12 +38,12 @@ export const mockUserFindByEmail = jest.fn(async (email: string): Promise<User |
3838
return null;
3939
});
4040

41-
jest.mock('../../../../src/database/repository/KeystoreRepo', () => ({
41+
jest.mock('../../../../../src/database/repository/KeystoreRepo', () => ({
4242
create: mockKeystoreCreate,
4343
}));
4444

45-
jest.mock('../../../../src/database/repository/UserRepo', () => ({
45+
jest.mock('../../../../../src/database/repository/UserRepo', () => ({
4646
findByEmail: mockUserFindByEmail,
4747
}));
4848

49-
jest.unmock('../../../../src/auth/authUtils'); // remove any override made anywhere
49+
jest.unmock('../../../../../src/auth/authUtils'); // remove any override made anywhere

tests/routes/v1/login/unit.test.ts renamed to tests/routes/v1/access/login/unit.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import '../../../../database/mock';
22
import '../../../../cache/mock';
3-
import { addHeaders } from '../../../auth/authentication/mock';
3+
import { addHeaders } from '../../../../auth/authentication/mock';
44

55
// the mock for this class should be below all other mock imports
66
import {
@@ -14,7 +14,7 @@ import {
1414
} from './mock';
1515

1616
import supertest from 'supertest';
17-
import app from '../../../../src/app';
17+
import app from '../../../../../src/app';
1818

1919
describe('Login basic route', () => {
2020
const endpoint = '/v1/login/basic';

tests/routes/v1/signup/mock.ts renamed to tests/routes/v1/access/signup/mock.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { mockUserFindByEmail } from '../login/mock';
2-
import User from '../../../../src/database/model/User';
3-
import Keystore from '../../../../src/database/model/Keystore';
2+
import User from '../../../../../src/database/model/User';
3+
import Keystore from '../../../../../src/database/model/Keystore';
44
import { Types } from 'mongoose';
55
import bcrypt from 'bcrypt';
66

@@ -30,7 +30,7 @@ export const mockUserCreate = jest.fn(
3030
},
3131
);
3232

33-
jest.mock('../../../../src/database/repository/UserRepo', () => ({
33+
jest.mock('../../../../../src/database/repository/UserRepo', () => ({
3434
findByEmail: mockUserFindByEmail, // utilising already defined mock
3535
create: mockUserCreate,
3636
}));

tests/routes/v1/signup/unit.test.ts renamed to tests/routes/v1/access/signup/unit.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// importing any mock file let the jest load all the mocks defined in that file
22
import '../../../../database/mock';
33
import '../../../../cache/mock';
4-
import { addHeaders } from '../../../auth/authentication/mock';
4+
import { addHeaders } from '../../../../auth/authentication/mock';
55
import { mockUserFindByEmail, createTokensSpy, USER_EMAIL, USER_PASSWORD } from '../login/mock';
66

77
// import the mock for this file below all mock imports
88
import { mockUserCreate, bcryptHashSpy, USER_NAME, USER_PROFILE_PIC } from './mock';
99

1010
import supertest from 'supertest';
11-
import app from '../../../../src/app';
11+
import app from '../../../../../src/app';
1212

1313
describe('Signup basic route', () => {
1414
const endpoint = '/v1/signup/basic';

0 commit comments

Comments
 (0)