tests are fixed

Author: pashidlos

src/builds/builds.module.ts

@@ -4,7 +4,7 @@ import { BuildsController } from './builds.controller';
 import { UsersModule } from '../users/users.module';
 import { PrismaService } from '../prisma/prisma.service';
 import { TestRunsModule } from '../test-runs/test-runs.module';
-import { EventsGateway } from 'src/events/events.gateway';
+import { EventsGateway } from '../events/events.gateway';
 
 @Module({
   imports: [UsersModule, TestRunsModule],

src/builds/builds.service.spec.ts

@@ -2,15 +2,18 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { BuildsService } from './builds.service';
 import { PrismaService } from '../prisma/prisma.service';
 import { TestRunsService } from '../test-runs/test-runs.service';
+import { EventsGateway } from '../events/events.gateway';
 
 describe('BuildsService', () => {
   let service: BuildsService;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
-      providers: [BuildsService,
+      providers: [
+        BuildsService,
         { provide: PrismaService, useValue: {} },
         { provide: TestRunsService, useValue: {} },
+        { provide: EventsGateway, useValue: {} },
       ],
     }).compile();
 

src/builds/builds.service.ts

@@ -3,7 +3,7 @@ import { CreateBuildDto } from './dto/build-create.dto';
 import { PrismaService } from '../prisma/prisma.service';
 import { Build } from '@prisma/client';
 import { TestRunsService } from '../test-runs/test-runs.service';
-import { EventsGateway } from 'src/events/events.gateway';
+import { EventsGateway } from '../events/events.gateway';
 import { BuildDto } from './dto/build.dto';
 
 @Injectable()
@@ -14,17 +14,6 @@ export class BuildsService {
     private eventsGateway: EventsGateway
   ) {}
 
-  async findOne(projectId: string): Promise<BuildDto> {
-    const build = await this.prismaService.build.findOne({
-      where: { id: projectId },
-      include: {
-        testRuns: true,
-      },
-    });
-
-    return new BuildDto(build);
-  }
-
   async findMany(projectId: string): Promise<BuildDto[]> {
     const buildList = await this.prismaService.build.findMany({
       where: { projectId },
@@ -51,7 +40,7 @@ export class BuildsService {
         testRuns: true,
       },
     });
-    const buildDto = new BuildDto(build)
+    const buildDto = new BuildDto(build);
     this.eventsGateway.buildCreated(buildDto);
     return buildDto;
   }

src/events/events.gateway.ts

@@ -1,14 +1,7 @@
-import {
-  SubscribeMessage,
-  WebSocketGateway,
-  MessageBody,
-  ConnectedSocket,
-  WebSocketServer,
-  WsResponse,
-} from '@nestjs/websockets';
-import { Socket, Server } from 'socket.io';
+import { WebSocketGateway, WebSocketServer } from '@nestjs/websockets';
+import { Server } from 'socket.io';
 import { TestRun } from '@prisma/client';
-import { BuildDto } from 'src/builds/dto/build.dto';
+import { BuildDto } from '../builds/dto/build.dto';
 
 @WebSocketGateway(4201)
 export class EventsGateway {

src/test-runs/test-runs.module.ts

@@ -3,7 +3,7 @@ import { TestRunsService } from './test-runs.service';
 import { SharedModule } from '../shared/shared.module';
 import { PrismaService } from '../prisma/prisma.service';
 import { TestRunsController } from './test-runs.controller';
-import { EventsGateway } from 'src/events/events.gateway';
+import { EventsGateway } from '../events/events.gateway';
 
 @Module({
   imports: [SharedModule],

src/test-runs/test-runs.service.spec.ts

@@ -4,11 +4,12 @@ import { TestRunsService } from './test-runs.service';
 import { PrismaService } from '../prisma/prisma.service';
 import { StaticService } from '../shared/static/static.service';
 import { PNG } from 'pngjs';
-import { TestStatus, TestRun } from '@prisma/client';
+import { TestStatus } from '@prisma/client';
 import Pixelmatch from 'pixelmatch';
-import { CreateTestRequestDto } from 'src/test/dto/create-test-request.dto';
+import { CreateTestRequestDto } from '../test/dto/create-test-request.dto';
 import { DiffResult } from './diffResult';
-import { IgnoreAreaDto } from 'src/test/dto/ignore-area.dto';
+import { IgnoreAreaDto } from '../test/dto/ignore-area.dto';
+import { EventsGateway } from '../events/events.gateway';
 
 jest.mock('pixelmatch');
 
@@ -21,6 +22,7 @@ const initService = async ({
   getImageMock = jest.fn(),
   saveImageMock = jest.fn(),
   deleteImageMock = jest.fn(),
+  eventNewTestRunMock = jest.fn(),
 }) => {
   const module: TestingModule = await Test.createTestingModule({
     providers: [
@@ -45,6 +47,12 @@ const initService = async ({
           deleteImage: deleteImageMock,
         },
       },
+      {
+        provide: EventsGateway,
+        useValue: {
+          newTestRun: eventNewTestRunMock,
+        },
+      },
     ],
   }).compile();
 
@@ -159,6 +167,15 @@ describe('TestRunsService', () => {
       device: 'device',
       diffTollerancePercent: 1,
     };
+    const testRunWithResult = {
+      id: 'id',
+      imageName: 'imageName',
+      baselineName: 'baselineName',
+      diffTollerancePercent: 1,
+      ignoreAreas: '[]',
+      diffName: 'diffName',
+      status: TestStatus.unresolved,
+    };
 
     it('no baseline', async () => {
       const testRun = {
@@ -200,13 +217,14 @@ describe('TestRunsService', () => {
         .fn()
         .mockReturnValueOnce(baseline)
         .mockReturnValueOnce(image);
-      service = await initService({ testRunCreateMock, saveImageMock, getImageMock });
+      const eventNewTestRunMock = jest.fn();
+      service = await initService({ testRunCreateMock, saveImageMock, getImageMock, eventNewTestRunMock });
       const getDiffMock = jest.fn().mockReturnValueOnce(diffResult);
       service.getDiff = getDiffMock;
-      const saveDiffResultMock = jest.fn();
+      const saveDiffResultMock = jest.fn().mockResolvedValueOnce(testRunWithResult);
       service.saveDiffResult = saveDiffResultMock;
 
-      await service.create(testVariation, createTestRequestDto);
+      const result = await service.create(testVariation, createTestRequestDto);
 
       expect(saveImageMock).toHaveBeenCalledWith('screenshot', Buffer.from(createTestRequestDto.imageBase64, 'base64'));
       expect(getImageMock).toHaveBeenNthCalledWith(1, testVariation.baselineName);
@@ -240,6 +258,8 @@ describe('TestRunsService', () => {
           status: TestStatus.new,
         },
       });
+      expect(eventNewTestRunMock).toHaveBeenCalledWith(testRunWithResult);
+      expect(result).toBe(testRunWithResult);
     });
 
     it('with baseline', async () => {
@@ -274,7 +294,8 @@ describe('TestRunsService', () => {
         .fn()
         .mockReturnValueOnce(baseline)
         .mockReturnValueOnce(image);
-      service = await initService({ testRunCreateMock, saveImageMock, getImageMock });
+      const eventNewTestRunMock = jest.fn();
+      service = await initService({ testRunCreateMock, saveImageMock, getImageMock, eventNewTestRunMock });
       const diffResult: DiffResult = {
         status: TestStatus.unresolved,
         diffName: 'diff image name',
@@ -285,9 +306,9 @@ describe('TestRunsService', () => {
       const getDiffMock = jest.fn().mockReturnValueOnce(diffResult);
       service.getDiff = getDiffMock;
       const saveDiffResultMock = jest.fn();
-      service.saveDiffResult = saveDiffResultMock;
+      service.saveDiffResult = saveDiffResultMock.mockResolvedValueOnce(testRunWithResult);
 
-      await service.create(testVariation, createTestRequestDto);
+      const result = await service.create(testVariation, createTestRequestDto);
 
       expect(saveImageMock).toHaveBeenCalledWith('screenshot', Buffer.from(createTestRequestDto.imageBase64, 'base64'));
       expect(service.getDiff).toHaveBeenCalledWith(
@@ -324,6 +345,8 @@ describe('TestRunsService', () => {
       });
       expect(getDiffMock).toHaveBeenCalledWith(baseline, image, testRun.diffTollerancePercent, testRun.ignoreAreas);
       expect(saveDiffResultMock).toHaveBeenCalledWith(testRun.id, diffResult);
+      expect(eventNewTestRunMock).toHaveBeenCalledWith(testRunWithResult);
+      expect(result).toBe(testRunWithResult);
     });
   });
 

src/test-runs/test-runs.service.ts

@@ -7,7 +7,7 @@ import { StaticService } from '../shared/static/static.service';
 import { PrismaService } from '../prisma/prisma.service';
 import { TestRun, TestStatus, TestVariation } from '@prisma/client';
 import { DiffResult } from './diffResult';
-import { EventsGateway } from 'src/events/events.gateway';
+import { EventsGateway } from '../events/events.gateway';
 
 @Injectable()
 export class TestRunsService {