From 949c731f8d6e8b3e87917a8284c3ad3ab953651f Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 7 Nov 2023 14:32:27 +0100
Subject: [PATCH] OZG-4320 OZG-4488 Use function for mockAsEsModule
---
.../lib/build-info/build-info.component.spec.ts | 12 +++++++-----
.../libs/tech-shared/src/lib/date.util.spec.ts | 12 +++++++-----
.../src/lib/+state/vorgang.reducer.spec.ts | 9 ++++++---
.../src/lib/vorgang-navigation.util.spec.ts | 8 +++++---
.../src/lib/vorgang-filter-view.guard.spec.ts | 15 +++++++++------
.../src/lib/wiedervorlage.service.spec.ts | 8 +++++---
6 files changed, 39 insertions(+), 25 deletions(-)
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 80d2be5aa5..f6dcc8051f 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 9e9dc97579..4a3d206c39 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 7ac729f843..d73dd18fd5 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 9aa3d5bb97..59a3d8da2f 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 b789904d18..6054a3bfeb 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 39e5d935dc..636389e3ab 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;
--
GitLab