Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { BuildsModule } from './builds/builds.module';
import { ProjectsModule } from './projects/projects.module';
import { TestRunsModule } from './test-runs/test-runs.module';
import { TestVariationsModule } from './test-variations/test-variations.module';
import { TestModule } from './test/test.module';
import { PrismaService } from './prisma/prisma.service';
import { ConfigModule } from '@nestjs/config';

Expand All @@ -18,7 +17,6 @@ import { ConfigModule } from '@nestjs/config';
ProjectsModule,
TestRunsModule,
TestVariationsModule,
TestModule,
],
providers: [PrismaService],
})
Expand Down
File renamed without changes.
8 changes: 7 additions & 1 deletion src/test-runs/test-runs.controller.spec.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
import { Test, TestingModule } from '@nestjs/testing';
import { TestRunsController } from './test-runs.controller';
import { TestRunsService } from './test-runs.service';
import { TestVariationsService } from '../test-variations/test-variations.service';
import { PrismaService } from '../prisma/prisma.service';

describe('TestRuns Controller', () => {
let controller: TestRunsController;

beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
controllers: [TestRunsController],
providers: [{ provide: TestRunsService, useValue: {} }]
providers: [
{ provide: TestRunsService, useValue: {} },
{ provide: TestVariationsService, useValue: {} },
{ provide: PrismaService, useValue: {} },
],
}).compile();

controller = module.get<TestRunsController>(TestRunsController);
Expand Down
17 changes: 14 additions & 3 deletions src/test-runs/test-runs.controller.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import { Controller, Delete, UseGuards, Param, ParseUUIDPipe, Put, Body, Get, Query } from '@nestjs/common';
import { ApiTags, ApiParam, ApiBearerAuth, ApiQuery } from '@nestjs/swagger';
import { Controller, Delete, UseGuards, Param, ParseUUIDPipe, Put, Body, Get, Query, Post } from '@nestjs/common';
import { ApiTags, ApiParam, ApiBearerAuth, ApiQuery, ApiSecurity, ApiOkResponse } from '@nestjs/swagger';
import { JwtAuthGuard } from '../auth/guards/auth.guard';
import { TestRun } from '@prisma/client';
import { TestRunsService } from './test-runs.service';
import { IgnoreAreaDto } from '../test/dto/ignore-area.dto';
import { IgnoreAreaDto } from './dto/ignore-area.dto';
import { CommentDto } from '../shared/dto/comment.dto';
import { TestRunResultDto } from './dto/testRunResult.dto';
import { ApiGuard } from '../auth/guards/api.guard';
import { CreateTestRequestDto } from './dto/create-test-request.dto';

@ApiTags('test-runs')
@Controller('test-runs')
Expand Down Expand Up @@ -69,4 +72,12 @@ export class TestRunsController {
updateComment(@Param('testRunId', new ParseUUIDPipe()) id: string, @Body() body: CommentDto): Promise<TestRun> {
return this.testRunsService.updateComment(id, body);
}

@Post()
@ApiSecurity('api_key')
@ApiOkResponse({ type: TestRunResultDto })
@UseGuards(ApiGuard)
postTestRun(@Body() createTestRequestDto: CreateTestRequestDto): Promise<TestRunResultDto> {
return this.testRunsService.postTestRun(createTestRequestDto);
}
}
3 changes: 2 additions & 1 deletion src/test-runs/test-runs.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import { SharedModule } from '../shared/shared.module';
import { PrismaService } from '../prisma/prisma.service';
import { TestRunsController } from './test-runs.controller';
import { EventsGateway } from '../events/events.gateway';
import { TestVariationsModule } from '../test-variations/test-variations.module';

@Module({
imports: [SharedModule],
imports: [SharedModule, TestVariationsModule],
providers: [TestRunsService, PrismaService, EventsGateway],
exports: [TestRunsService],
controllers: [TestRunsController]
Expand Down
35 changes: 20 additions & 15 deletions src/test-runs/test-runs.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ import { StaticService } from '../shared/static/static.service';
import { PNG } from 'pngjs';
import { TestStatus, Build, TestRun } from '@prisma/client';
import Pixelmatch from 'pixelmatch';
import { CreateTestRequestDto } from '../test/dto/create-test-request.dto';
import { CreateTestRequestDto } from './dto/create-test-request.dto';
import { DiffResult } from './diffResult';
import { IgnoreAreaDto } from '../test/dto/ignore-area.dto';
import { IgnoreAreaDto } from './dto/ignore-area.dto';
import { EventsGateway } from '../events/events.gateway';
import { CommentDto } from '../shared/dto/comment.dto';
import { BuildDto } from '../builds/dto/build.dto';
import { TestVariationsService } from '../test-variations/test-variations.service';

jest.mock('pixelmatch');

Expand Down Expand Up @@ -43,7 +44,7 @@ const initService = async ({
},
build: {
findOne: buildFindOneMock,
}
},
},
},
{
Expand All @@ -58,9 +59,13 @@ const initService = async ({
provide: EventsGateway,
useValue: {
newTestRun: eventNewTestRunMock,
buildUpdated: eventBuildUpdatedMock
buildUpdated: eventBuildUpdatedMock,
},
},
{
provide: TestVariationsService,
useValue: {},
},
],
}).compile();

Expand Down Expand Up @@ -113,7 +118,7 @@ describe('TestRunsService', () => {
status: TestStatus.failed,
},
});
expect(service.emitUpdateBuildEvent).toBeCalledWith(testRun.buildId)
expect(service.emitUpdateBuildEvent).toBeCalledWith(testRun.buildId);
});

describe('approve', () => {
Expand Down Expand Up @@ -174,7 +179,7 @@ describe('TestRunsService', () => {
},
},
});
expect(service.emitUpdateBuildEvent).toBeCalledWith(testRun.buildId)
expect(service.emitUpdateBuildEvent).toBeCalledWith(testRun.buildId);
});
});

Expand Down Expand Up @@ -615,23 +620,23 @@ describe('TestRunsService', () => {
},
],
};
const buildFindOneMock = jest.fn().mockResolvedValueOnce(build)
const eventBuildUpdatedMock = jest.fn()
const buildFindOneMock = jest.fn().mockResolvedValueOnce(build);
const eventBuildUpdatedMock = jest.fn();
service = await initService({
buildFindOneMock,
eventBuildUpdatedMock,
});

await service.emitUpdateBuildEvent(build.id)
await service.emitUpdateBuildEvent(build.id);

expect(buildFindOneMock).toHaveBeenCalledWith({
where: {
id: build.id
id: build.id,
},
include: {
testRuns: true
}
})
expect(eventBuildUpdatedMock).toHaveBeenCalledWith(new BuildDto(build))
})
testRuns: true,
},
});
expect(eventBuildUpdatedMock).toHaveBeenCalledWith(new BuildDto(build));
});
});
15 changes: 13 additions & 2 deletions src/test-runs/test-runs.service.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
import { Injectable } from '@nestjs/common';
import { PNG } from 'pngjs';
import Pixelmatch from 'pixelmatch';
import { CreateTestRequestDto } from '../test/dto/create-test-request.dto';
import { IgnoreAreaDto } from '../test/dto/ignore-area.dto';
import { CreateTestRequestDto } from './dto/create-test-request.dto';
import { IgnoreAreaDto } from './dto/ignore-area.dto';
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 '../events/events.gateway';
import { CommentDto } from '../shared/dto/comment.dto';
import { BuildDto } from '../builds/dto/build.dto';
import { TestRunResultDto } from '../test-runs/dto/testRunResult.dto';
import { TestVariationsService } from '../test-variations/test-variations.service';

@Injectable()
export class TestRunsService {
constructor(
private testVariationService: TestVariationsService,
private prismaService: PrismaService,
private staticService: StaticService,
private eventsGateway: EventsGateway,
Expand All @@ -40,6 +43,14 @@ export class TestRunsService {
});
}

async postTestRun(createTestRequestDto: CreateTestRequestDto): Promise<TestRunResultDto> {
const testVariation = await this.testVariationService.findOrCreate(createTestRequestDto);

const testRun = await this.create(testVariation, createTestRequestDto);

return new TestRunResultDto(testRun, testVariation);
}

async emitUpdateBuildEvent(buildId: string) {
const build = await this.prismaService.build.findOne({
where: {
Expand Down
2 changes: 1 addition & 1 deletion src/test-variations/test-variations.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { TestVariationsService } from './test-variations.service';
import { TestVariation, Baseline } from '@prisma/client';
import { JwtAuthGuard } from '../auth/guards/auth.guard';
import { PrismaService } from '../prisma/prisma.service';
import { IgnoreAreaDto } from '../test/dto/ignore-area.dto';
import { IgnoreAreaDto } from '../test-runs/dto/ignore-area.dto';
import { CommentDto } from '../shared/dto/comment.dto';

@ApiTags('test-variations')
Expand Down
4 changes: 2 additions & 2 deletions src/test-variations/test-variations.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Test, TestingModule } from '@nestjs/testing';
import { TestVariationsService } from './test-variations.service';
import { PrismaService } from '../prisma/prisma.service';
import { CreateTestRequestDto } from '../test/dto/create-test-request.dto';
import { CreateTestRequestDto } from '../test-runs/dto/create-test-request.dto';
import { StaticService } from '../shared/static/static.service';
import { IgnoreAreaDto } from 'src/test/dto/ignore-area.dto';
import { IgnoreAreaDto } from '../test-runs/dto/ignore-area.dto';
import { TestVariation, Baseline } from '@prisma/client';
import { CommentDto } from '../shared/dto/comment.dto';

Expand Down
4 changes: 2 additions & 2 deletions src/test-variations/test-variations.service.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Injectable } from '@nestjs/common';
import { CreateTestRequestDto } from '../test/dto/create-test-request.dto';
import { IgnoreAreaDto } from '../test/dto/ignore-area.dto';
import { CreateTestRequestDto } from '../test-runs/dto/create-test-request.dto';
import { IgnoreAreaDto } from '../test-runs/dto/ignore-area.dto';
import { PrismaService } from '../prisma/prisma.service';
import { TestVariation, Baseline } from '@prisma/client';
import { StaticService } from '../shared/static/static.service';
Expand Down
28 changes: 0 additions & 28 deletions src/test/test.controller.spec.ts

This file was deleted.

25 changes: 0 additions & 25 deletions src/test/test.controller.ts

This file was deleted.

15 changes: 0 additions & 15 deletions src/test/test.module.ts

This file was deleted.

20 changes: 0 additions & 20 deletions src/test/test.service.spec.ts

This file was deleted.

21 changes: 0 additions & 21 deletions src/test/test.service.ts

This file was deleted.