Skip to content
Open
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
8 changes: 7 additions & 1 deletion src/compare/libs/odiff/odiff.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { TestingModule, Test } from '@nestjs/testing';
import { TestStatus } from '@prisma/client';
import { IgnoreAreaDto } from 'src/test-runs/dto/ignore-area.dto';
import { IgnoreAreaDto } from '../../../test-runs/dto/ignore-area.dto';
import { StaticService } from '../../../static/static.service';
import { HddService } from '../../../static/hdd/hdd.service';
import { DIFF_DIMENSION_RESULT, NO_BASELINE_RESULT } from '../consts';
import { OdiffService, DEFAULT_CONFIG, ignoreAreaToRegionMapper } from './odiff.service';
import { OdiffConfig, OdiffIgnoreRegions } from './odiff.types';
Expand All @@ -25,6 +26,11 @@ const initService = async ({
provide: StaticService,
useValue: {
deleteImage: deleteImageMock,
},
},
{
provide: HddService,
useValue: {
generateNewImage: generateNewImageMock,
getImagePath: getImagePathMock,
},
Expand Down
12 changes: 6 additions & 6 deletions src/compare/libs/odiff/odiff.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import { ImageComparator } from '../image-comparator.interface';
import { ImageCompareInput } from '../ImageCompareInput';
import { DIFF_DIMENSION_RESULT, NO_BASELINE_RESULT } from '../consts';
import { compare } from 'odiff-bin';
import { IgnoreAreaDto } from 'src/test-runs/dto/ignore-area.dto';
import { IgnoreAreaDto } from '../../../test-runs/dto/ignore-area.dto';
import { OdiffConfig, OdiffIgnoreRegions, OdiffResult } from './odiff.types';
import { HddService } from 'src/static/hdd/hdd.service';
import { HddService } from '../../../static/hdd/hdd.service';

export const DEFAULT_CONFIG: OdiffConfig = {
outputDiffMask: true,
Expand All @@ -21,11 +21,11 @@ export const DEFAULT_CONFIG: OdiffConfig = {
@Injectable()
export class OdiffService implements ImageComparator {
private readonly logger: Logger = new Logger(OdiffService.name);
private readonly hddService: HddService;

constructor(private readonly staticService: StaticService) {
this.hddService = this.staticService as unknown as HddService;
}
constructor(
private readonly staticService: StaticService,
private readonly hddService: HddService,
) {}

parseConfig(configJson: string): OdiffConfig {
return parseConfig(configJson, DEFAULT_CONFIG, this.logger);
Expand Down
3 changes: 2 additions & 1 deletion src/static/hdd/hdd.service.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { Logger } from '@nestjs/common';
import { Injectable, Logger } from '@nestjs/common';
import path from 'path';
import { writeFileSync, readFileSync, unlink, mkdirSync, existsSync } from 'fs';
import { PNG, PNGWithMetadata } from 'pngjs';
import { Static } from '../static.interface';
import { HDD_IMAGE_PATH } from './constants';
import { generateNewImageName } from '../utils';

@Injectable()
export class HddService implements Static {
private readonly logger: Logger = new Logger(HddService.name);

Expand Down
5 changes: 3 additions & 2 deletions src/static/static.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import { ConfigModule } from '@nestjs/config';
import { StaticService } from './static.service';
import { StaticFactoryService } from './static.factory';
import { StaticController } from './static.controller';
import { HddService } from './hdd/hdd.service';

@Module({
imports: [ConfigModule],
providers: [StaticService, StaticFactoryService],
exports: [StaticService],
providers: [StaticService, StaticFactoryService, HddService],
exports: [StaticService, HddService],
controllers: [StaticController],
})
export class StaticModule {}
Loading