Skip to content

Commit e954937

Browse files
authored
TestVariation. Do not remove test run in case deleted #204 (#104)
Visual-Regression-Tracker/Visual-Regression-Tracker#204
1 parent 73a3419 commit e954937

File tree

2 files changed

+4
-45
lines changed

2 files changed

+4
-45
lines changed

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

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -466,37 +466,12 @@ describe('TestVariationsService', () => {
466466
ignoreAreas: JSON.parse(testVariationSecond.ignoreAreas),
467467
});
468468
expect(testRunCreateMock).toHaveBeenCalledTimes(2);
469-
expect(buildUpdateMock).toHaveBeenCalledWith(build.id, { "isRunning": false });
469+
expect(buildUpdateMock).toHaveBeenCalledWith(build.id, { isRunning: false });
470470
});
471471

472472
it('delete', async () => {
473473
const testRunId = 'test run id';
474474
const testVariationId = 'test variation id';
475-
const testRun: TestRun = {
476-
id: testRunId,
477-
imageName: '1592423768112.screenshot.png',
478-
diffName: null,
479-
diffPercent: null,
480-
diffTollerancePercent: 1,
481-
pixelMisMatchCount: null,
482-
status: 'new',
483-
buildId: '146e7a8d-89f0-4565-aa2c-e61efabb0afd',
484-
testVariationId: testVariationId,
485-
updatedAt: new Date(),
486-
createdAt: new Date(),
487-
name: 'ss2f77',
488-
browser: 'chromium',
489-
device: null,
490-
os: null,
491-
viewport: '1800x1600',
492-
baselineName: null,
493-
ignoreAreas: '[]',
494-
tempIgnoreAreas: '[]',
495-
comment: 'some comment',
496-
baselineBranchName: 'master',
497-
branchName: 'develop',
498-
merge: false,
499-
};
500475
const variation: TestVariation & {
501476
baselines: Baseline[];
502477
} = {
@@ -526,25 +501,17 @@ describe('TestVariationsService', () => {
526501
};
527502

528503
const variationDeleteMock = jest.fn();
529-
const testRunFindMany = jest.fn().mockResolvedValueOnce([testRun]);
530-
const testRunDeleteMock = jest.fn();
531504
const getDetailsMock = jest.fn().mockResolvedValueOnce(variation);
532505
const deleteBaselineMock = jest.fn().mockResolvedValueOnce(variation.baselines[0]);
533506
const service = await initModule({
534507
variationDeleteMock,
535-
testRunFindMany,
536-
testRunDeleteMock,
537508
});
538509
service.getDetails = getDetailsMock;
539510
service.deleteBaseline = deleteBaselineMock;
540511

541512
await service.delete(testVariationId);
542513

543514
expect(service.getDetails).toHaveBeenCalledWith(testVariationId);
544-
expect(testRunFindMany).toHaveBeenCalledWith({
545-
where: { testVariationId },
546-
});
547-
expect(testRunDeleteMock).toHaveBeenCalledWith(testRunId);
548515
expect(service.deleteBaseline).toHaveBeenCalledWith(variation.baselines[0]);
549516
expect(variationDeleteMock).toHaveBeenCalledWith({
550517
where: { id: testVariationId },

src/test-variations/test-variations.service.ts

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export class TestVariationsService {
2121
private testRunsService: TestRunsService,
2222
@Inject(forwardRef(() => BuildsService))
2323
private buildsService: BuildsService
24-
) { }
24+
) {}
2525

2626
async getDetails(id: string): Promise<TestVariation & { baselines: Baseline[] }> {
2727
return this.prismaService.testVariation.findUnique({
@@ -138,19 +138,11 @@ export class TestVariationsService {
138138
});
139139

140140
// stop build
141-
return this.buildsService.update(build.id, { "isRunning": false });
141+
return this.buildsService.update(build.id, { isRunning: false });
142142
}
143143

144144
async delete(id: string): Promise<TestVariation> {
145-
const [testVariation, testRuns] = await Promise.all([
146-
this.getDetails(id),
147-
this.prismaService.testRun.findMany({
148-
where: { testVariationId: id },
149-
}),
150-
]);
151-
152-
// delete testRun
153-
await Promise.all(testRuns.map((item) => this.testRunsService.delete(item.id)));
145+
const testVariation = await this.getDetails(id);
154146

155147
// delete baseline
156148
await Promise.all(testVariation.baselines.map((baseline) => this.deleteBaseline(baseline)));

0 commit comments

Comments
 (0)