diff --git a/goofy-client/libs/navigation/src/lib/build-info/build-info.component.spec.ts b/goofy-client/libs/navigation/src/lib/build-info/build-info.component.spec.ts index 80d2be5aa5f629e837d83c542dedef3fdd6419a9..f6dcc8051f2348f01ce02d5749ca0f6e5fac0c3c 100644 --- a/goofy-client/libs/navigation/src/lib/build-info/build-info.component.spec.ts +++ b/goofy-client/libs/navigation/src/lib/build-info/build-info.component.spec.ts @@ -30,14 +30,16 @@ import { BuildInfoComponent } from './build-info.component'; import * as DateUtil from '@goofy-client/tech-shared'; -jest.mock('@goofy-client/tech-shared', () => { +registerLocaleData(localeDe); + +jest.mock('@goofy-client/tech-shared', () => mockAsEsModule('@goofy-client/tech-shared')); + +function mockAsEsModule(module: string) { return { __esModule: true, - ...jest.requireActual('@goofy-client/tech-shared') + ...jest.requireActual(module) }; -}); - -registerLocaleData(localeDe); +} describe('BuildInfoComponent', () => { let component: BuildInfoComponent; diff --git a/goofy-client/libs/tech-shared/src/lib/date.util.spec.ts b/goofy-client/libs/tech-shared/src/lib/date.util.spec.ts index 9e9dc97579f2bded5ac64df66c4fe41c3290039a..4a3d206c39280b9e7b755a1d8c97a434651e85b4 100644 --- a/goofy-client/libs/tech-shared/src/lib/date.util.spec.ts +++ b/goofy-client/libs/tech-shared/src/lib/date.util.spec.ts @@ -28,14 +28,16 @@ import { formatDateWithoutYearWithTime, formatForDatabase, formatFullDate, forma import faker from '@faker-js/faker'; import * as dateFns from 'date-fns'; -jest.mock('date-fns', () => { +jest.mock('date-fns', () => mockAsEsModule('date-fns')); + +registerLocaleData(localeDe); + +function mockAsEsModule(module: string) { return { __esModule: true, - ...jest.requireActual('date-fns') + ...jest.requireActual(module) }; -}); - -registerLocaleData(localeDe); +} describe('Date Util', () => { diff --git a/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.reducer.spec.ts b/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.reducer.spec.ts index 7ac729f843e3c9dd202281dd3742eb4cc8baf5f2..d73dd18fd51493f8598dfca7e2704b1ee57d31a9 100644 --- a/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.reducer.spec.ts +++ b/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.reducer.spec.ts @@ -52,12 +52,15 @@ import * as NavigationActions from '@goofy-client/navigation-shared'; import * as VorgangActions from './vorgang.actions'; import * as Reducer from './vorgang.reducer'; -jest.mock('@goofy-client/app-shared', () => { +jest.mock('@goofy-client/app-shared', () => mockAsEsModule('@goofy-client/app-shared')); + + +function mockAsEsModule(module: string) { return { __esModule: true, - ...jest.requireActual('@goofy-client/app-shared') + ...jest.requireActual(module) }; -}); +} describe('Vorgang Reducer', () => { diff --git a/goofy-client/libs/vorgang-shared/src/lib/vorgang-navigation.util.spec.ts b/goofy-client/libs/vorgang-shared/src/lib/vorgang-navigation.util.spec.ts index 9aa3d5bb973a3bdc7e300dc2e2d1befc09a46c9c..59a3d8da2f981ab399f2ca39a4ecea4c9a0916cf 100644 --- a/goofy-client/libs/vorgang-shared/src/lib/vorgang-navigation.util.spec.ts +++ b/goofy-client/libs/vorgang-shared/src/lib/vorgang-navigation.util.spec.ts @@ -34,12 +34,14 @@ import { VorgangFilter, VorgangView } from './vorgang.model'; import * as Storage from '@goofy-client/app-shared'; import * as VorgangNavigationUtil from './vorgang-navigation.util'; -jest.mock('@goofy-client/app-shared', () => { +jest.mock('@goofy-client/app-shared', () => mockAsEsModule('@goofy-client/app-shared')); + +function mockAsEsModule(module: string) { return { __esModule: true, - ...jest.requireActual('@goofy-client/app-shared') + ...jest.requireActual(module) }; -}); +} describe('Vorgang Navigation Util', () => { diff --git a/goofy-client/libs/vorgang/src/lib/vorgang-filter-view.guard.spec.ts b/goofy-client/libs/vorgang/src/lib/vorgang-filter-view.guard.spec.ts index b789904d1844e5bd2c909d3727207c35bbccc72b..6054a3bfeb759b8002220f09c0ace9654373f675 100644 --- a/goofy-client/libs/vorgang/src/lib/vorgang-filter-view.guard.spec.ts +++ b/goofy-client/libs/vorgang/src/lib/vorgang-filter-view.guard.spec.ts @@ -8,16 +8,19 @@ import { Observable, of } from 'rxjs'; import * as RouterHelper from '@angular/router'; import * as Guard from './vorgang-filter-view.guard'; -jest.mock('@angular/router', () => { - return { - __esModule: true, - ...jest.requireActual('@angular/router') - }; -}); +jest.mock('@angular/router', () => mockAsEsModule('@angular/router')); const next: ActivatedRouteSnapshot = {} as unknown as ActivatedRouteSnapshot; const state: RouterStateSnapshot = { root: { url: [<UrlSegment>{}] } } as unknown as RouterStateSnapshot; + +function mockAsEsModule(module: string) { + return { + __esModule: true, + ...jest.requireActual(module) + }; +} + describe('vorgangFilterViewGuard', () => { const vorgangService = mock(VorgangService); const authService = mock(AuthService); diff --git a/goofy-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.spec.ts b/goofy-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.spec.ts index 39e5d935dc8c5ab1f6083ff00033d0bd21344e7a..636389e3abc17ce538d651a919a44c5c8ebc579c 100644 --- a/goofy-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.spec.ts +++ b/goofy-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.spec.ts @@ -44,12 +44,14 @@ import { WiedervorlageService } from './wiedervorlage.service'; import * as TechShared from '@goofy-client/tech-shared'; -jest.mock('@goofy-client/tech-shared', () => { +jest.mock('@goofy-client/tech-shared', () => mockAsEsModule('@goofy-client/tech-shared')); + +function mockAsEsModule(module: string) { return { __esModule: true, - ...jest.requireActual('@goofy-client/tech-shared') + ...jest.requireActual(module) }; -}); +} describe('WiedervorlageService', () => { let service: WiedervorlageService;