wip

geonetwork · Jan 10, 2025 · fecc6b7 · fecc6b7
1 parent 5c54086
commit fecc6b7
Show file tree

Hide file tree

Showing 34 changed files with 92 additions and 353 deletions.
diff --git a/apps/datafeeder/src/test-setup.ts b/apps/datafeeder/src/test-setup.ts
@@ -1,15 +1,4 @@
-import 'jest-preset-angular/setup-jest'
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'
 import '../../../jest.setup'
 
-import { getTestBed } from '@angular/core/testing'
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing'
-
-getTestBed().resetTestEnvironment()
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting(),
-  { teardown: { destroyAfterEach: false } }
-)
+setupZoneTestEnv({ teardown: { destroyAfterEach: false } })
diff --git a/apps/datahub/src/test-setup.ts b/apps/datahub/src/test-setup.ts
@@ -1,6 +1,8 @@
-import 'jest-preset-angular/setup-jest'
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'
 import '../../../jest.setup'
 
+setupZoneTestEnv()
+
 class ResizeObserverMock {
   observe = jest.fn()
   unobserve = jest.fn()

diff --git a/apps/demo/src/test-setup.ts b/apps/demo/src/test-setup.ts
@@ -1,15 +1,4 @@
-import 'jest-preset-angular/setup-jest'
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'
 import '../../../jest.setup'
 
-import { getTestBed } from '@angular/core/testing'
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing'
-
-getTestBed().resetTestEnvironment()
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting(),
-  { teardown: { destroyAfterEach: false } }
-)
+setupZoneTestEnv({ teardown: { destroyAfterEach: false } })
diff --git a/apps/map-viewer/src/test-setup.ts b/apps/map-viewer/src/test-setup.ts
@@ -1,2 +1,4 @@
-import 'jest-preset-angular/setup-jest'
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'
 import '../../../jest.setup'
+
+setupZoneTestEnv()
diff --git a/apps/metadata-converter/src/test-setup.ts b/apps/metadata-converter/src/test-setup.ts
@@ -1,2 +1,4 @@
-import 'jest-preset-angular/setup-jest'
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'
 import '../../../jest.setup'
+
+setupZoneTestEnv()
diff --git a/apps/metadata-editor/src/app/auth-guard.service.spec.ts b/apps/metadata-editor/src/app/auth-guard.service.spec.ts
@@ -5,9 +5,12 @@ import { TestBed } from '@angular/core/testing'
 import { of } from 'rxjs'
 import { PlatformServiceInterface } from '@geonetwork-ui/common/domain/platform.service.interface'
 
-Object.defineProperty(window, 'location', {
-  value: new URL('http://localhost'),
-})
+// window.location.href = 'http://localhost/'
+
+// let currentUrl
+// jest
+//   .spyOn(window.location, 'href', 'set')
+//   .mockImplementation((url) => (currentUrl = url))
 
 describe('AuthGuardService', () => {
   let service: AuthGuardService

diff --git a/apps/metadata-editor/src/test-setup.ts b/apps/metadata-editor/src/test-setup.ts
@@ -1,13 +1,8 @@
-import 'jest-preset-angular/setup-jest'
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'
 import '../../../jest.setup'
 
 import { CommonModule } from '@angular/common'
-import { getTestBed } from '@angular/core/testing'
 import { BrowserModule } from '@angular/platform-browser'
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing'
 import { RouterModule } from '@angular/router'
 import { AvatarServiceInterface } from '@geonetwork-ui/api/repository'
 import { PlatformServiceInterface } from '@geonetwork-ui/common/domain/platform.service.interface'
@@ -17,12 +12,7 @@ import { ngMocks } from 'ng-mocks'
 import { BehaviorSubject, EMPTY } from 'rxjs'
 import { TranslateModule } from '@ngx-translate/core'
 
-getTestBed().resetTestEnvironment()
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting(),
-  { teardown: { destroyAfterEach: false } }
-)
+setupZoneTestEnv()
 
 // ng-mocks global configuration
 ngMocks.autoSpy('jest')

diff --git a/apps/search/src/test-setup.ts b/apps/search/src/test-setup.ts
@@ -1,15 +1,4 @@
-import 'jest-preset-angular/setup-jest'
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'
 import '../../../jest.setup'
 
-import { getTestBed } from '@angular/core/testing'
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing'
-
-getTestBed().resetTestEnvironment()
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting(),
-  { teardown: { destroyAfterEach: false } }
-)
+setupZoneTestEnv({ teardown: { destroyAfterEach: false } })
diff --git a/apps/webcomponents/src/test-setup.ts b/apps/webcomponents/src/test-setup.ts
@@ -1,15 +1,4 @@
-import 'jest-preset-angular/setup-jest'
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'
 import '../../../jest.setup'
 
-import { getTestBed } from '@angular/core/testing'
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing'
-
-getTestBed().resetTestEnvironment()
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting(),
-  { teardown: { destroyAfterEach: false } }
-)
+setupZoneTestEnv({ teardown: { destroyAfterEach: false } })
diff --git a/libs/api/metadata-converter/src/lib/gn4/gn4.converter.spec.ts b/libs/api/metadata-converter/src/lib/gn4/gn4.converter.spec.ts
@@ -1,4 +1,4 @@
-import 'jest-preset-angular/setup-jest'
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'
 import {
   elasticFullResponseFixture,
   elasticHitsOnlyFixture,
@@ -15,6 +15,8 @@ import {
 import { TranslateService } from '@ngx-translate/core'
 import { Gn4Record } from '../gn4/types/metadata.model'
 
+setupZoneTestEnv()
+
 class MetadataUrlServiceMock {
   translate = undefined
   getUrl = (uuid) => `http://my.catalog.org/metadata/${uuid}`

diff --git a/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.spec.ts b/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.spec.ts
@@ -1,10 +1,12 @@
-import 'jest-preset-angular/setup-jest'
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'
 import { TestBed } from '@angular/core/testing'
 import { elasticLinkFixture } from '@geonetwork-ui/common/fixtures'
 import { Gn4FieldMapper } from './gn4.field.mapper'
 import { MetadataUrlService } from './metadata-url.service'
 import { TranslateService } from '@ngx-translate/core'
 
+setupZoneTestEnv()
+
 class MetadataUrlServiceMock {
   translate = undefined
   getUrl = () => 'url'

diff --git a/libs/api/metadata-converter/src/lib/gn4/metadata-url.service.spec.ts b/libs/api/metadata-converter/src/lib/gn4/metadata-url.service.spec.ts
@@ -1,9 +1,11 @@
-import 'jest-preset-angular/setup-jest'
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'
 import { TestBed } from '@angular/core/testing'
 import { TranslateService } from '@ngx-translate/core'
 import { MetadataUrlService } from './metadata-url.service'
 import { Configuration } from '@geonetwork-ui/data-access/gn4'
 
+setupZoneTestEnv()
+
 const translateServiceMock = {
   currentLang: 'en',
 }

diff --git a/libs/api/repository/src/test-setup.ts b/libs/api/repository/src/test-setup.ts
@@ -1,2 +1,4 @@
-import 'jest-preset-angular/setup-jest'
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'
 import '../../../../jest.setup'
+
+setupZoneTestEnv()
diff --git a/libs/feature/auth/src/test-setup.ts b/libs/feature/auth/src/test-setup.ts
@@ -1,15 +1,4 @@
-import 'jest-preset-angular/setup-jest'
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'
 import '../../../../jest.setup'
 
-import { getTestBed } from '@angular/core/testing'
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing'
-
-getTestBed().resetTestEnvironment()
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting(),
-  { teardown: { destroyAfterEach: false } }
-)
+setupZoneTestEnv({ teardown: { destroyAfterEach: false } })
diff --git a/libs/feature/catalog/src/test-setup.ts b/libs/feature/catalog/src/test-setup.ts
@@ -1,15 +1,4 @@
-import 'jest-preset-angular/setup-jest'
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'
 import '../../../../jest.setup'
 
-import { getTestBed } from '@angular/core/testing'
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing'
-
-getTestBed().resetTestEnvironment()
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting(),
-  { teardown: { destroyAfterEach: false } }
-)
+setupZoneTestEnv({ teardown: { destroyAfterEach: false } })
diff --git a/libs/feature/dataviz/src/test-setup.ts b/libs/feature/dataviz/src/test-setup.ts
@@ -1,18 +1,7 @@
-import 'jest-preset-angular/setup-jest'
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'
 import '../../../../jest.setup'
 
-import { getTestBed } from '@angular/core/testing'
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing'
-
-getTestBed().resetTestEnvironment()
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting(),
-  { teardown: { destroyAfterEach: false } }
-)
+setupZoneTestEnv({ teardown: { destroyAfterEach: false } })
 
 class ResizeObserverMock {
   observe = jest.fn()

diff --git a/libs/feature/editor/src/test-setup.ts b/libs/feature/editor/src/test-setup.ts
@@ -1,24 +1,13 @@
-import 'jest-preset-angular/setup-jest'
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'
 import '../../../../jest.setup'
-
-import { getTestBed } from '@angular/core/testing'
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing'
 import { ngMocks } from 'ng-mocks'
 import { CommonModule } from '@angular/common'
 import { BrowserModule } from '@angular/platform-browser'
 import { TranslateModule } from '@ngx-translate/core'
 import { EditorFacade } from './lib/+state/editor.facade'
 import { EMPTY } from 'rxjs'
 
-getTestBed().resetTestEnvironment()
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting(),
-  { teardown: { destroyAfterEach: false } }
-)
+setupZoneTestEnv({ teardown: { destroyAfterEach: false } })
 
 // ng-mocks global configuration
 ngMocks.autoSpy('jest')

diff --git a/libs/feature/map/src/test-setup.ts b/libs/feature/map/src/test-setup.ts
@@ -1,18 +1,7 @@
-import 'jest-preset-angular/setup-jest'
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'
 import '../../../../jest.setup'
 
-import { getTestBed } from '@angular/core/testing'
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing'
-
-getTestBed().resetTestEnvironment()
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting(),
-  { teardown: { destroyAfterEach: false } }
-)
+setupZoneTestEnv({ teardown: { destroyAfterEach: false } })
 
 class ResizeObserverMock {
   observe = jest.fn()

diff --git a/libs/feature/notifications/src/test-setup.ts b/libs/feature/notifications/src/test-setup.ts
@@ -1,18 +1,7 @@
-import 'jest-preset-angular/setup-jest'
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'
 import '../../../../jest.setup'
 
-import { getTestBed } from '@angular/core/testing'
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing'
-
-getTestBed().resetTestEnvironment()
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting(),
-  { teardown: { destroyAfterEach: false } }
-)
+setupZoneTestEnv({ teardown: { destroyAfterEach: false } })
 
 class ResizeObserverMock {
   observe = jest.fn()