From 8542b5287f4f2427c84a28939de24d96f130d628 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 2 Nov 2023 13:42:51 +0100
Subject: [PATCH] OZG-4320 OZG-4488 Upgrade zone.js and fix tests
---
.../src/lib/build-info/build-info.component.spec.ts | 7 +++++++
goofy-client/libs/tech-shared/src/lib/date.util.spec.ts | 7 +++++++
.../vorgang-shared/src/lib/+state/vorgang.reducer.spec.ts | 7 +++++++
.../src/lib/vorgang-navigation.util.spec.ts | 7 +++++++
.../vorgang/src/lib/vorgang-filter-view.guard.spec.ts | 7 +++++++
.../src/lib/wiedervorlage.service.spec.ts | 7 +++++++
goofy-client/package-lock.json | 8 ++++----
goofy-client/package.json | 2 +-
8 files changed, 47 insertions(+), 5 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 d941e53a35..80d2be5aa5 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,6 +30,13 @@ import { BuildInfoComponent } from './build-info.component';
import * as DateUtil from '@goofy-client/tech-shared';
+jest.mock('@goofy-client/tech-shared', () => {
+ return {
+ __esModule: true,
+ ...jest.requireActual('@goofy-client/tech-shared')
+ };
+});
+
registerLocaleData(localeDe);
describe('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 e4aceb390f..9e9dc97579 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,6 +28,13 @@ import { formatDateWithoutYearWithTime, formatForDatabase, formatFullDate, forma
import faker from '@faker-js/faker';
import * as dateFns from 'date-fns';
+jest.mock('date-fns', () => {
+ return {
+ __esModule: true,
+ ...jest.requireActual('date-fns')
+ };
+});
+
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 84349fb28b..7ac729f843 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,6 +52,13 @@ 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', () => {
+ return {
+ __esModule: true,
+ ...jest.requireActual('@goofy-client/app-shared')
+ };
+});
+
describe('Vorgang Reducer', () => {
describe('unknown action', () => {
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 e268b8b408..9aa3d5bb97 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,6 +34,13 @@ 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', () => {
+ return {
+ __esModule: true,
+ ...jest.requireActual('@goofy-client/app-shared')
+ };
+});
+
describe('Vorgang Navigation Util', () => {
afterEach(() => {
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 fff54fd375..b789904d18 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,6 +8,13 @@ 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')
+ };
+});
+
const next: ActivatedRouteSnapshot = {} as unknown as ActivatedRouteSnapshot;
const state: RouterStateSnapshot = { root: { url: [<UrlSegment>{}] } } as unknown as RouterStateSnapshot;
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 66620330c4..39e5d935dc 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,6 +44,13 @@ import { WiedervorlageService } from './wiedervorlage.service';
import * as TechShared from '@goofy-client/tech-shared';
+jest.mock('@goofy-client/tech-shared', () => {
+ return {
+ __esModule: true,
+ ...jest.requireActual('@goofy-client/tech-shared')
+ };
+});
+
describe('WiedervorlageService', () => {
let service: WiedervorlageService;
let repository: Mock<WiedervorlageRepository>;
diff --git a/goofy-client/package-lock.json b/goofy-client/package-lock.json
index 458616c4ed..d5ad5dc3ec 100644
--- a/goofy-client/package-lock.json
+++ b/goofy-client/package-lock.json
@@ -38,7 +38,7 @@
"sanitize-filename-ts": "^1.0.2",
"tslib": "^2.3.0",
"typeface-roboto": "1.1.13",
- "zone.js": "0.13.0"
+ "zone.js": "~0.13.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "16.2.8",
@@ -30948,9 +30948,9 @@
}
},
"node_modules/zone.js": {
- "version": "0.13.0",
- "resolved": "http://nexus.ozg-sh.de/repository/npm-proxy/zone.js/-/zone.js-0.13.0.tgz",
- "integrity": "sha512-7m3hNNyswsdoDobCkYNAy5WiUulkMd3+fWaGT9ij6iq3Zr/IwJo4RMCYPSDjT+r7tnPErmY9sZpKhWQ8S5k6XQ==",
+ "version": "0.13.3",
+ "resolved": "http://nexus.ozg-sh.de/repository/npm-proxy/zone.js/-/zone.js-0.13.3.tgz",
+ "integrity": "sha512-MKPbmZie6fASC/ps4dkmIhaT5eonHkEt6eAy80K42tAm0G2W+AahLJjbfi6X9NPdciOE9GRFTTM8u2IiF6O3ww==",
"license": "MIT",
"dependencies": {
"tslib": "^2.3.0"
diff --git a/goofy-client/package.json b/goofy-client/package.json
index f13e6039dd..fe8266f267 100644
--- a/goofy-client/package.json
+++ b/goofy-client/package.json
@@ -72,7 +72,7 @@
"sanitize-filename-ts": "^1.0.2",
"tslib": "^2.3.0",
"typeface-roboto": "1.1.13",
- "zone.js": "0.13.0"
+ "zone.js": "~0.13.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "16.2.8",
--
GitLab