[DSC-2256] fix tests build issues

Author: Andrea Barbasso

src/app/admin/admin-notifications/admin-notifications-suggestion-targets-page/admin-notifications-suggestion-targets-page.component.ts

@@ -1,6 +1,8 @@
 import { Component } from '@angular/core';
+import {
+  PublicationClaimComponent
+} from '../../../notifications/suggestions/targets/publication-claim/publication-claim.component';
 
-import { PublicationClaimComponent } from '../../../notifications/suggestion-targets/publication-claim/publication-claim.component';
 
 @Component({
   selector: 'ds-admin-notifications-reciter-page',

src/app/app.component.spec.ts

@@ -43,7 +43,6 @@ import {
   NativeWindowService,
 } from './core/services/window.service';
 import { ThemedRootComponent } from './root/themed-root.component';
-import { KlaroService } from './shared/cookies/klaro.service';
 import { DatadogRumService } from './shared/datadog-rum/datadog-rum.service';
 import { HostWindowResizeAction } from './shared/host-window.actions';
 import { HostWindowService } from './shared/host-window.service';
@@ -62,6 +61,7 @@ import { MenuServiceStub } from './shared/testing/menu-service.stub';
 import { ThemeService } from './shared/theme-support/theme.service';
 import { SocialComponent } from './social/social.component';
 import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
+import { OrejimeService } from './shared/cookies/orejime.service';
 
 let comp: AppComponent;
 let fixture: ComponentFixture<AppComponent>;
@@ -83,7 +83,7 @@ describe('App component', () => {
 
   let breadcrumbsServiceSpy;
   let routeServiceMock;
-  let klaroServiceSpy: jasmine.SpyObj<KlaroService>;
+  let orejimeServiceSpy: jasmine.SpyObj<OrejimeService>;
   let datadogRumServiceSpy: jasmine.SpyObj<DatadogRumService>;
   let routerEventsObs: Subject<any>;
   let routerMock: Router;
@@ -99,7 +99,7 @@ describe('App component', () => {
       events: routerEventsObs,
     });
 
-    klaroServiceSpy = jasmine.createSpyObj('KlaroService', {
+    orejimeServiceSpy = jasmine.createSpyObj('OrejimeService', {
       getSavedPreferences: jasmine.createSpy('getSavedPreferences'),
       watchConsentUpdates: jasmine.createSpy('watchConsentUpdates').and.returnValue(null),
     },{
@@ -137,7 +137,7 @@ describe('App component', () => {
         { provide: BreadcrumbsService, useValue: breadcrumbsServiceSpy },
         { provide: RouteService, useValue: routeServiceMock },
         { provide: APP_CONFIG, useValue: environment },
-        { provide: KlaroService, useValue: klaroServiceSpy },
+        { provide: OrejimeService, useValue: orejimeServiceSpy },
         { provide: DatadogRumService, useValue: datadogRumServiceSpy },
         provideMockStore({ initialState }),
         AppComponent,

src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts

@@ -800,7 +800,7 @@ describe('EditBitstreamPageComponent', () => {
           {
             provide: ActivatedRoute,
             useValue: {
-              data: observableOf({ bitstream: createSuccessfulRemoteDataObject(bitstream) }),
+              data: of({ bitstream: createSuccessfulRemoteDataObject(bitstream) }),
               snapshot: { queryParams: {} },
             },
           },
@@ -930,7 +930,7 @@ describe('EditBitstreamPageComponent', () => {
           {
             provide: ActivatedRoute,
             useValue: {
-              data: observableOf({ bitstream: createSuccessfulRemoteDataObject(bitstream) }),
+              data: of({ bitstream: createSuccessfulRemoteDataObject(bitstream) }),
               snapshot: { queryParams: {} },
             },
           },

src/app/core/auth/auth.effects.spec.ts

@@ -497,7 +497,7 @@ describe('AuthEffects', () => {
       it('should return a REFRESH_STATE_TOKEN_AND_REDIRECT_SUCCESS action in response to a REFRESH_STATE_TOKEN_AND_REDIRECT action', (done) => {
 
         store.overrideSelector(getAuthenticatedUser, { id: EPersonMock.id } as EPerson);
-        spyOn((authEffects as any).authService, 'retrieveAuthenticatedUserById').and.returnValue(observableOf(EPersonMock));
+        spyOn((authEffects as any).authService, 'retrieveAuthenticatedUserById').and.returnValue(of(EPersonMock));
 
         actions = hot('--a-', {
           a: {

src/app/core/shared/metadata.utils.spec.ts

@@ -183,7 +183,7 @@ describe('Metadata', () => {
 
   describe('hasValue method', () => {
     const testHasValue = (value, expected) =>
-      testMethod(Metadata.hasValue, 'boolean', value, null, expected);
+      testMethod(Metadata.hasValue, 'boolean', value, null, undefined, expected, undefined, undefined);
 
     describe('with undefined value', () => {
       testHasValue(undefined, false);

src/app/correlation-id/correlation-id.service.spec.ts

@@ -4,7 +4,7 @@ import {
   StoreModule,
 } from '@ngrx/store';
 import { MockStore } from '@ngrx/store/testing';
-import { of } from 'rxjs';
+import { BehaviorSubject, of } from 'rxjs';
 
 import {
   appReducers,
@@ -40,6 +40,9 @@ describe('CorrelationIdService', () => {
       getSavedPreferences: () => of({ CORRELATION_ID_OREJIME_KEY: true }),
       initialize: jasmine.createSpy('initialize'),
       showSettings: jasmine.createSpy('showSettings'),
+      watchConsentUpdates: () => of(),
+      consentsUpdates$: new BehaviorSubject({ CORRELATION_ID_OREJIME_KEY: true }),
+      initialized$: new BehaviorSubject(true),
     };
 
     service = new CorrelationIdService(cookieService, uuidService, store, mockOrejimeService, { nativeWindow: undefined });

src/app/cris-layout/pipes/ds-date.pipe.spec.ts

@@ -1,4 +1,5 @@
 import { DsDatePipe } from './ds-date.pipe';
+import { waitForAsync } from '@angular/core/testing';
 
 describe('DsDatePipe', () => {
 
@@ -24,28 +25,33 @@ describe('DsDatePipe', () => {
     expect(pipe).toBeTruthy();
   });
 
-  it('Should transform the given date and time', () => {
-    const value = pipe.transform(`${date}T11:22:33Z`);
-    expect(value).toEqual(parsedDate);
-  });
-
-  it('Should transform the given date (YYYY-MM-DD)', () => {
-    const value = pipe.transform(date);
-    expect(value).toEqual(parsedDate);
-  });
-
-  it('Should transform the given date (YYYY-MM)', () => {
-    const value = pipe.transform('2020-08');
-    expect(value).toEqual('August 2020');
-  });
-
-  it('Should transform the given date (YYYY)', () => {
-    const value = pipe.transform('2020');
-    expect(value).toEqual('2020');
-  });
-
-  it('Should not transform invalid dates', () => {
-    const value = pipe.transform('ABCDE');
-    expect(value).toEqual('ABCDE');
-  });
+  it('Should transform the given date and time', waitForAsync(() => {
+    pipe.transform(`${date}T11:22:33Z`).subscribe(value => {
+      expect(value).toEqual(parsedDate);
+    });
+  }));
+
+  it('Should transform the given date (YYYY-MM-DD)', waitForAsync(() => {
+    pipe.transform(date).subscribe(value => {
+      expect(value).toEqual(parsedDate);
+    });
+  }));
+
+  it('Should transform the given date (YYYY-MM)', waitForAsync(() => {
+    pipe.transform('2020-08').subscribe(value => {
+      expect(value).toEqual('August 2020');
+    });
+  }));
+
+  it('Should transform the given date (YYYY)', waitForAsync(() => {
+    pipe.transform('2020').subscribe(value => {
+      expect(value).toEqual('2020');
+    });
+  }));
+
+  it('Should not transform invalid dates', waitForAsync(() => {
+    pipe.transform('ABCDE').subscribe(value => {
+      expect(value).toEqual('ABCDE');
+    });
+  }));
 });

src/app/cris-layout/services/resolver-strategy.service.spec.ts

@@ -13,7 +13,7 @@ describe('ResolverStrategyService', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({});
-    service = TestBed.get(ResolverStrategyService);
+    service = new ResolverStrategyService();
   });
 
   it('should be created', () => {

src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.spec.ts

@@ -66,6 +66,12 @@ describe('DsoEditMetadataAuthorityFieldComponent', () => {
         href: 'entries',
       },
     },
+    entity: '',
+    externalSource: undefined,
+    multiValueOnGenerator: false,
+    getExternalSourceByMetadata(metadata): string {
+      return '';
+    },
   };
 
   const mockVocabularyHierarchical: Vocabulary = {
@@ -83,6 +89,12 @@ describe('DsoEditMetadataAuthorityFieldComponent', () => {
         href: 'entries',
       },
     },
+    entity: '',
+    externalSource: undefined,
+    multiValueOnGenerator: false,
+    getExternalSourceByMetadata(metadata): string {
+      return '';
+    },
   };
 
   const mockVocabularySuggester: Vocabulary = {
@@ -100,6 +112,12 @@ describe('DsoEditMetadataAuthorityFieldComponent', () => {
         href: 'entries',
       },
     },
+    entity: '',
+    externalSource: undefined,
+    multiValueOnGenerator: false,
+    getExternalSourceByMetadata(metadata): string {
+      return '';
+    },
   };
 
   let editMetadataValue: DsoEditMetadataValue;

src/app/info/end-user-agreement/end-user-agreement.component.spec.ts

@@ -159,7 +159,7 @@ describe('EndUserAgreementComponent', () => {
   describe('when the user has already accepted the agreement', () => {
 
     beforeEach(() => {
-      (endUserAgreementService.hasCurrentUserOrCookieAcceptedAgreement as jasmine.Spy).and.returnValue(observableOf(true));
+      (endUserAgreementService.hasCurrentUserOrCookieAcceptedAgreement as jasmine.Spy).and.returnValue(of(true));
       component.ngOnInit();
       fixture.detectChanges();
     });
@@ -206,7 +206,7 @@ describe('EndUserAgreementComponent', () => {
   describe('warning notification logic', () => {
     beforeEach(() => {
       (endUserAgreementService.hasCurrentUserOrCookieAcceptedAgreement as jasmine.Spy)
-        .and.returnValue(observableOf(false));
+        .and.returnValue(of(false));
       fixture.detectChanges();
     });
 
@@ -221,7 +221,7 @@ describe('EndUserAgreementComponent', () => {
       component.ngOnInit();
       (notificationsService.warning as jasmine.Spy).calls.reset();
       (endUserAgreementService.hasCurrentUserOrCookieAcceptedAgreement as jasmine.Spy)
-        .and.returnValue(observableOf(true));
+        .and.returnValue(of(true));
       component.initAccepted();
       expect(notificationsService.warning).not.toHaveBeenCalled();
     });