diff --git a/src/compare/libs/odiff/odiff.service.spec.ts b/src/compare/libs/odiff/odiff.service.spec.ts index 6906ca3..514a788 100644 --- a/src/compare/libs/odiff/odiff.service.spec.ts +++ b/src/compare/libs/odiff/odiff.service.spec.ts @@ -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'; @@ -25,6 +26,11 @@ const initService = async ({ provide: StaticService, useValue: { deleteImage: deleteImageMock, + }, + }, + { + provide: HddService, + useValue: { generateNewImage: generateNewImageMock, getImagePath: getImagePathMock, }, diff --git a/src/compare/libs/odiff/odiff.service.ts b/src/compare/libs/odiff/odiff.service.ts index e25c656..7ebfba9 100644 --- a/src/compare/libs/odiff/odiff.service.ts +++ b/src/compare/libs/odiff/odiff.service.ts @@ -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, @@ -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); diff --git a/src/static/hdd/hdd.service.ts b/src/static/hdd/hdd.service.ts index ca3c706..8e102f8 100644 --- a/src/static/hdd/hdd.service.ts +++ b/src/static/hdd/hdd.service.ts @@ -1,4 +1,4 @@ -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'; @@ -6,6 +6,7 @@ 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); diff --git a/src/static/static.module.ts b/src/static/static.module.ts index 9f41cf5..553bf9f 100644 --- a/src/static/static.module.ts +++ b/src/static/static.module.ts @@ -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 {}