Skip to content

Commit 15f2e5a

Browse files
committed
Upgrade Jest, minor TS and plain Passport
1 parent 253d5ee commit 15f2e5a

File tree

9 files changed

+2226
-4316
lines changed

9 files changed

+2226
-4316
lines changed

package-lock.json

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

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@nestjs/config": "^1.2.0",
3030
"@nestjs/core": "^8.4.1",
3131
"@nestjs/jwt": "^8.0.0",
32-
"@nestjs/passport": "^8.2.1",
32+
"@nestjs/passport": "^8.2.2",
3333
"@nestjs/platform-express": "^8.4.1",
3434
"@nestjs/platform-socket.io": "^8.4.1",
3535
"@nestjs/schedule": "^1.0.2",
@@ -45,8 +45,8 @@
4545
"fs-extra": "^10.0.1",
4646
"looks-same": "^8.2.1",
4747
"odiff-bin": "^2.5.0",
48-
"passport": "^0.5.2",
49-
"passport-jwt": "^4.0.0",
48+
"passport": "^0.6.0",
49+
"passport-jwt": "^4.0.1",
5050
"passport-local": "^1.0.0",
5151
"pg": "^8.7.3",
5252
"pg-hstore": "^2.3.4",
@@ -66,7 +66,7 @@
6666
"@types/cache-manager": "^3.4.3",
6767
"@types/cron": "^1.7.3",
6868
"@types/express": "^4.17.13",
69-
"@types/jest": "27.4.1",
69+
"@types/jest": "^29.5.3",
7070
"@types/lodash": "^4.14.180",
7171
"@types/multer": "^1.4.7",
7272
"@types/node": "^17.0.21",
@@ -81,15 +81,15 @@
8181
"eslint": "^8.47.0",
8282
"eslint-config-prettier": "^9.0.0",
8383
"eslint-plugin-import": "^2.28.0",
84-
"jest": "^27.5.1",
84+
"jest": "^29.6.2",
8585
"prettier": "^3.0.1",
8686
"prisma": "^5.1.1",
8787
"supertest": "^6.2.2",
88-
"ts-jest": "^27.1.3",
89-
"ts-loader": "^9.2.8",
90-
"ts-node": "^10.7.0",
91-
"tsconfig-paths": "^3.14.0",
92-
"typescript": "^4.9.2"
88+
"ts-jest": "^29.1.1",
89+
"ts-loader": "^9.4.4",
90+
"ts-node": "^10.9.1",
91+
"tsconfig-paths": "^4.2.0",
92+
"typescript": "^4.9.5"
9393
},
9494
"prisma": {
9595
"seed": "ts-node prisma/seed.ts"

src/_data_/index.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Baseline, Build, ImageComparison, Project, TestRun, TestVariation } from '@prisma/client';
22
import { PNG } from 'pngjs';
33

4+
45
export const TEST_PROJECT: Project = {
56
id: '1',
67
name: 'Test Project',
@@ -41,10 +42,14 @@ export const generateBaseline = (baseline?: Partial<Baseline>): Baseline => {
4142
};
4243
};
4344

45+
type TestVariationWithBaselines = TestVariation & {
46+
baselines: Baseline[];
47+
}
48+
4449
export const generateTestVariation = (
4550
testVariation?: Partial<TestVariation>,
4651
baselines?: Baseline[]
47-
): TestVariation & { baselines: Baseline[] } => {
52+
): TestVariationWithBaselines => {
4853
return {
4954
id: '123',
5055
projectId: 'project Id',

src/builds/builds.service.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { PrismaService } from '../prisma/prisma.service';
44
import { TestRunsService } from '../test-runs/test-runs.service';
55
import { EventsGateway } from '../shared/events/events.gateway';
66
import { Build, TestRun, TestStatus } from '@prisma/client';
7-
import { mocked } from 'jest-mock';
7+
import { mocked, MockedObject } from 'jest-mock';
88
import { BuildDto } from './dto/build.dto';
99
import { ProjectsService } from '../projects/projects.service';
1010
import { generateTestRun } from '../_data_';
@@ -115,7 +115,7 @@ describe('BuildsService', () => {
115115
it('findOne', async () => {
116116
const buildFindUniqueMock = jest.fn().mockResolvedValueOnce(build);
117117
const testRunFindManyMock = jest.fn().mockResolvedValueOnce(build.testRuns);
118-
mocked(BuildDto).mockReturnValueOnce(buildDto);
118+
mocked(BuildDto).mockReturnValueOnce(buildDto as MockedObject<BuildDto>);
119119
service = await initService({ buildFindUniqueMock, testRunFindManyMock });
120120

121121
const result = await service.findOne('someId');
@@ -128,7 +128,7 @@ describe('BuildsService', () => {
128128
const buildFindManyMock = jest.fn().mockResolvedValueOnce([build]);
129129
const buildCountMock = jest.fn().mockResolvedValueOnce(33);
130130
const projectId = 'someId';
131-
mocked(BuildDto).mockReturnValueOnce(buildDto);
131+
mocked(BuildDto).mockReturnValueOnce(buildDto as MockedObject<BuildDto>);
132132
service = await initService({ buildFindManyMock, buildCountMock });
133133

134134
const result = await service.findMany(projectId, 10, 20);
@@ -183,7 +183,7 @@ describe('BuildsService', () => {
183183
const id = 'some id';
184184
const buildUpdateMock = jest.fn();
185185
const eventsBuildUpdatedMock = jest.fn();
186-
mocked(BuildDto).mockReturnValueOnce(buildDto);
186+
mocked(BuildDto).mockReturnValueOnce(buildDto as MockedObject<BuildDto>);
187187
service = await initService({ buildUpdateMock, eventsBuildUpdatedMock });
188188

189189
const result = await service.update(id, { isRunning: false });

src/builds/builds.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ export class BuildsService {
123123
projectId: string;
124124
branchName: string;
125125
ciBuildId?: string;
126-
}) {
126+
}): Promise<Build> {
127127
const where: Prisma.BuildWhereUniqueInput = ciBuildId
128128
? {
129129
projectId_ciBuildId: {

src/compare/utils/__snapshots__/index.spec.ts.snap

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`utils applyIgnoreAreas 1`] = `
4-
Object {
5-
"data": Array [
4+
{
5+
"data": [
66
255,
77
255,
88
255,
@@ -45,8 +45,8 @@ Object {
4545
`;
4646

4747
exports[`utils applyIgnoreAreas 2`] = `
48-
Object {
49-
"data": Array [
48+
{
49+
"data": [
5050
0,
5151
0,
5252
0,
@@ -89,8 +89,8 @@ Object {
8989
`;
9090

9191
exports[`utils applyIgnoreAreas 3`] = `
92-
Object {
93-
"data": Array [
92+
{
93+
"data": [
9494
255,
9595
255,
9696
255,
@@ -133,8 +133,8 @@ Object {
133133
`;
134134

135135
exports[`utils applyIgnoreAreas 4`] = `
136-
Object {
137-
"data": Array [
136+
{
137+
"data": [
138138
255,
139139
255,
140140
255,

src/jest.config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/** @returns {Promise<import('jest').Config>} */
22
module.exports = async () => {
33
return {
4-
name: 'unit',
54
displayName: 'Unit Tests',
65
roots: ['./'],
76
moduleFileExtensions: ['js', 'json', 'ts'],

test/jest.config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/** @returns {Promise<import('jest').Config>} */
22
module.exports = async () => {
33
return {
4-
name: 'e2e',
54
displayName: 'E2E Tests',
65
roots: ['./'],
76
testTimeout: 30000,

test_acceptance/jest.config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/** @returns {Promise<import('jest').Config>} */
22
module.exports = async () => {
33
return {
4-
name: 'Acceptance',
54
displayName: 'Acceptance',
65
roots: ['./'],
76
testTimeout: 30000,

0 commit comments

Comments
 (0)