chore: fix various test failures part III

Also fix warnings

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 } })

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()

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 } })

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()

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()

apps/metadata-editor/src/app/auth-guard.service.spec.ts

@@ -4,13 +4,12 @@ import { AuthService } from '@geonetwork-ui/api/repository'
 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'),
-})
+import { Location } from '@angular/common'
 
 describe('AuthGuardService', () => {
   let service: AuthGuardService
+  let location: Location
+
   beforeEach(() => {
     return MockBuilder(AuthGuardService)
   })
@@ -26,19 +25,19 @@ describe('AuthGuardService', () => {
         }),
       ],
     })
-    window.location.href = 'http://original.path'
     service = TestBed.inject(AuthGuardService)
+    location = TestBed.inject(Location)
   })
 
   it('returns true if the user is logged in', async () => {
     jest
       .spyOn(TestBed.inject(PlatformServiceInterface), 'isAnonymous')
       .mockReturnValue(of(false))
     expect(await service.canActivate()).toBe(true)
-    expect(window.location.href).toBe('http://original.path/')
+    expect(location.go).not.toHaveBeenCalled()
   })
   it('redirects the user to the login page if the user is not logged in', async () => {
     expect(await service.canActivate()).toBe(false)
-    expect(window.location.href).toBe('http://login.com/bla?')
+    expect(location.go).toHaveBeenCalledWith('http://login.com/bla?')
   })
 })

apps/metadata-editor/src/app/auth-guard.service.ts

@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core'
+import { Location } from '@angular/common'
 import { AuthService } from '@geonetwork-ui/api/repository'
 import { PlatformServiceInterface } from '@geonetwork-ui/common/domain/platform.service.interface'
 import { firstValueFrom } from 'rxjs'
@@ -7,14 +8,15 @@ import { firstValueFrom } from 'rxjs'
 export class AuthGuardService {
   constructor(
     private platformService: PlatformServiceInterface,
-    private authService: AuthService
+    private authService: AuthService,
+    private locationService: Location
   ) {}
 
   // this will redirect the user to the authentication form if required
   async canActivate(): Promise<boolean> {
     const notLoggedIn = await firstValueFrom(this.platformService.isAnonymous())
     if (notLoggedIn) {
-      window.location.href = this.authService.loginUrl
+      this.locationService.go(this.authService.loginUrl)
       return false
     }
     return true

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')

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 } })

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 } })

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}`

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'

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',
 }

libs/api/repository/src/lib/gn4/auth/auth.service.spec.ts

@@ -2,18 +2,15 @@ import { AuthService, LOGIN_URL } from './auth.service'
 import { TestBed } from '@angular/core/testing'
 import { TranslateService } from '@ngx-translate/core'
 import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { MockProvider } from 'ng-mocks'
+import { Location } from '@angular/common'
 
 let loginUrlTokenMock
 const translateServiceMock = {
   currentLang: 'fr',
 }
 
 let windowLocation
-Object.defineProperties((global as any).window, {
-  location: {
-    get: () => new URL(windowLocation),
-  },
-})
 
 describe('AuthService', () => {
   let service: AuthService
@@ -30,6 +27,9 @@ describe('AuthService', () => {
           provide: TranslateService,
           useValue: translateServiceMock,
         },
+        MockProvider(Location, {
+          path: () => windowLocation,
+        }),
       ],
       imports: [HttpClientTestingModule],
     })

libs/api/repository/src/lib/gn4/auth/auth.service.ts

@@ -1,6 +1,7 @@
 import { Inject, Injectable, InjectionToken, Optional } from '@angular/core'
 import { LANG_2_TO_3_MAPPER } from '@geonetwork-ui/util/i18n'
 import { TranslateService } from '@ngx-translate/core'
+import { Location } from '@angular/common'
 
 export const DEFAULT_GN4_LOGIN_URL = `/geonetwork/srv/\${lang3}/catalog.signin?redirect=\${current_url}`
 export const LOGIN_URL = new InjectionToken<string>('loginUrl')
@@ -21,13 +22,13 @@ export class AuthService {
 
   get loginUrl() {
     let baseUrl = this.baseLoginUrl
-    const locationHasQueryParams = !!window.location.search
+    const locationHasQueryParams = !!new URL(this.location.path()).search
     // this is specific to georchestra login URL based on a ?login query param
     if (baseUrl.startsWith('${current_url}?') && locationHasQueryParams) {
       baseUrl = baseUrl.replace('?', '&')
     }
     return baseUrl
-      .replace('${current_url}', window.location.toString())
+      .replace('${current_url}', new URL(this.location.path()).toString())
       .replace('${lang2}', this.translateService.currentLang)
       .replace(
         '${lang3}',
@@ -50,6 +51,7 @@ export class AuthService {
     @Optional() @Inject(LOGIN_URL) private baseLoginUrlToken: string,
     @Optional() @Inject(LOGOUT_URL) private baseLogoutUrlToken: string,
     @Optional() @Inject(SETTINGS_URL) private baseSettingsUrlToken: string,
-    private translateService: TranslateService
+    private translateService: TranslateService,
+    private location: Location
   ) {}
 }

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()

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 } })

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 } })

libs/feature/dataviz/src/lib/service/data.service.spec.ts

@@ -3,6 +3,8 @@ import { DataService } from './data.service'
 import { openDataset } from '@geonetwork-ui/data-fetcher'
 import { PROXY_PATH } from '@geonetwork-ui/util/shared'
 import { lastValueFrom } from 'rxjs'
+import { MockProvider } from 'ng-mocks'
+import { Location } from '@angular/common'
 
 const newEndpointCall = jest.fn()
 
@@ -637,6 +639,9 @@ describe('DataService', () => {
             provide: PROXY_PATH,
             useValue: 'http://proxy.local/?url=',
           },
+          MockProvider(Location, {
+            path: () => 'http://localhost',
+          }),
         ],
       })
       service = TestBed.inject(DataService)

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()