134770: Test fixes

- Cast the store.dispatch method in expect calls, because ngrx now has multiple methods with the same name and jest can't deal with it
- Removed the APP_INITIALIZER tests since it can't be tested like that anymore with the new provider format

(cherry picked from commit d181c03)

Author: alexandrevryghem

src/app/app.component.spec.ts

@@ -145,7 +145,7 @@ describe('App component', () => {
     });
 
     it('should dispatch a HostWindowResizeAction with the width and height of the window as its payload', () => {
-      expect(store.dispatch).toHaveBeenCalledWith(new HostWindowResizeAction(width, height));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new HostWindowResizeAction(width, height));
     });
 
   });

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

@@ -242,7 +242,7 @@ describe('AuthService test', () => {
       });
 
       it('store should dispatch SetUserAsIdleAction', () => {
-        expect(mockStore.dispatch).toHaveBeenCalledWith(new SetUserAsIdleAction());
+        expect(mockStore.dispatch as jasmine.Spy).toHaveBeenCalledWith(new SetUserAsIdleAction());
       });
     });
 
@@ -252,7 +252,7 @@ describe('AuthService test', () => {
       });
 
       it('store should dispatch UnsetUserAsIdleAction', () => {
-        expect(mockStore.dispatch).toHaveBeenCalledWith(new UnsetUserAsIdleAction());
+        expect(mockStore.dispatch as jasmine.Spy).toHaveBeenCalledWith(new UnsetUserAsIdleAction());
       });
     });
   });

src/app/core/cache/object-cache.service.spec.ts

@@ -145,7 +145,7 @@ describe('ObjectCacheService', () => {
   describe('add', () => {
     it('should dispatch an ADD action with the object to add, the time to live, and the current timestamp', () => {
       service.add(objectToCache, msToLive, requestUUID, alternativeLink);
-      expect(store.dispatch).toHaveBeenCalledWith(new AddToObjectCacheAction(objectToCache, timestamp, msToLive, requestUUID, alternativeLink));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new AddToObjectCacheAction(objectToCache, timestamp, msToLive, requestUUID, alternativeLink));
       expect(linkServiceStub.removeResolvedLinks).toHaveBeenCalledWith(objectToCache);
     });
   });
@@ -157,20 +157,20 @@ describe('ObjectCacheService', () => {
 
     it('should dispatch a REMOVE action with the self link of the object to remove', () => {
       service.remove(selfLink);
-      expect(store.dispatch).toHaveBeenCalledWith(new RemoveFromObjectCacheAction(selfLink));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new RemoveFromObjectCacheAction(selfLink));
     });
 
     it('should dispatch a REMOVE_BY_SUBSTRING action on the index state for each alternativeLink in the object', () => {
       service.remove(selfLink);
       cacheEntry.alternativeLinks.forEach(
-        (link: string) => expect(store.dispatch).toHaveBeenCalledWith(new RemoveFromIndexBySubstringAction(IndexName.ALTERNATIVE_OBJECT_LINK, link)));
+        (link: string) => expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new RemoveFromIndexBySubstringAction(IndexName.ALTERNATIVE_OBJECT_LINK, link)));
     });
 
     it('should dispatch a REMOVE_BY_SUBSTRING action on the index state for each _links in the object, except the self link', () => {
       service.remove(selfLink);
       Object.entries(objectToCache._links).forEach(([key, value]: [string, HALLink]) => {
         if (key !== 'self') {
-          expect(store.dispatch).toHaveBeenCalledWith(new RemoveFromIndexBySubstringAction(IndexName.ALTERNATIVE_OBJECT_LINK, value.href));
+          expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new RemoveFromIndexBySubstringAction(IndexName.ALTERNATIVE_OBJECT_LINK, value.href));
         }
       });
     });
@@ -339,8 +339,8 @@ describe('ObjectCacheService', () => {
   describe('patch methods', () => {
     it('should dispatch the correct actions when addPatch is called', () => {
       service.addPatch(selfLink, operations);
-      expect(store.dispatch).toHaveBeenCalledWith(new AddPatchObjectCacheAction(selfLink, operations));
-      expect(store.dispatch).toHaveBeenCalledWith(new AddToSSBAction(selfLink, RestRequestMethod.PATCH));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new AddPatchObjectCacheAction(selfLink, operations));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new AddToSSBAction(selfLink, RestRequestMethod.PATCH));
     });
 
     it('isDirty should return true when the patches list in the cache entry is not empty', () => {
@@ -360,7 +360,7 @@ describe('ObjectCacheService', () => {
     });
     it('should dispatch the correct actions when applyPatchesToCachedObject is called', () => {
       (service as any).applyPatchesToCachedObject(selfLink);
-      expect(store.dispatch).toHaveBeenCalledWith(new ApplyPatchObjectCacheAction(selfLink));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new ApplyPatchObjectCacheAction(selfLink));
     });
   });
 
@@ -392,12 +392,12 @@ describe('ObjectCacheService', () => {
     describe('addDependency', () => {
       it('should dispatch an ADD_DEPENDENTS action', () => {
         service.addDependency(selfLink, 'objectWithoutDependents');
-        expect(store.dispatch).toHaveBeenCalledOnceWith(new AddDependentsObjectCacheAction('objectWithoutDependents', [requestUUID]));
+        expect(store.dispatch as jasmine.Spy).toHaveBeenCalledOnceWith(new AddDependentsObjectCacheAction('objectWithoutDependents', [requestUUID]));
       });
 
       it('should resolve alt links', () => {
         service.addDependency(anotherLink, 'objectWithoutDependentsAlt');
-        expect(store.dispatch).toHaveBeenCalledOnceWith(new AddDependentsObjectCacheAction('objectWithoutDependents', [requestUUID]));
+        expect(store.dispatch as jasmine.Spy).toHaveBeenCalledOnceWith(new AddDependentsObjectCacheAction('objectWithoutDependents', [requestUUID]));
       });
 
       it('should not dispatch if either href cannot be resolved to a cached self link', () => {
@@ -421,7 +421,7 @@ describe('ObjectCacheService', () => {
 
       it('should work with observable hrefs', () => {
         service.addDependency(of(selfLink), of('objectWithoutDependents'));
-        expect(store.dispatch).toHaveBeenCalledOnceWith(new AddDependentsObjectCacheAction('objectWithoutDependents', [requestUUID]));
+        expect(store.dispatch as jasmine.Spy).toHaveBeenCalledOnceWith(new AddDependentsObjectCacheAction('objectWithoutDependents', [requestUUID]));
       });
 
       it('should only dispatch once for the first value of either observable href', () => {
@@ -442,7 +442,7 @@ describe('ObjectCacheService', () => {
           service.addDependency(href$, dependsOnHref$);
           flush();
 
-          expect(store.dispatch).toHaveBeenCalledOnceWith(new AddDependentsObjectCacheAction('objectWithoutDependents', [requestUUID]));
+          expect(store.dispatch as jasmine.Spy).toHaveBeenCalledOnceWith(new AddDependentsObjectCacheAction('objectWithoutDependents', [requestUUID]));
         });
       });
 
@@ -467,12 +467,12 @@ describe('ObjectCacheService', () => {
     describe('removeDependents', () => {
       it('should dispatch a REMOVE_DEPENDENTS action', () => {
         service.removeDependents('objectWithDependents');
-        expect(store.dispatch).toHaveBeenCalledOnceWith(new RemoveDependentsObjectCacheAction('objectWithDependents'));
+        expect(store.dispatch as jasmine.Spy).toHaveBeenCalledOnceWith(new RemoveDependentsObjectCacheAction('objectWithDependents'));
       });
 
       it('should resolve alt links', () => {
         service.removeDependents('objectWithDependentsAlt');
-        expect(store.dispatch).toHaveBeenCalledOnceWith(new RemoveDependentsObjectCacheAction('objectWithDependents'));
+        expect(store.dispatch as jasmine.Spy).toHaveBeenCalledOnceWith(new RemoveDependentsObjectCacheAction('objectWithDependents'));
       });
 
       it('should not dispatch if the href cannot be resolved to a cached self link', () => {

src/app/core/data/bitstream-format-data.service.spec.ts

@@ -247,7 +247,7 @@ describe('BitstreamFormatDataService', () => {
       format.uuid = 'uuid';
 
       service.selectBitstreamFormat(format);
-      expect(store.dispatch).toHaveBeenCalledWith(new BitstreamFormatsRegistrySelectAction(format));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new BitstreamFormatsRegistrySelectAction(format));
     });
   });
 
@@ -270,7 +270,7 @@ describe('BitstreamFormatDataService', () => {
       format.uuid = 'uuid';
 
       service.deselectBitstreamFormat(format);
-      expect(store.dispatch).toHaveBeenCalledWith(new BitstreamFormatsRegistryDeselectAction(format));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new BitstreamFormatsRegistryDeselectAction(format));
     });
   });
 
@@ -291,7 +291,7 @@ describe('BitstreamFormatDataService', () => {
     }));
     it('should remove all bitstreamFormats from the store', () => {
       service.deselectAllBitstreamFormats();
-      expect(store.dispatch).toHaveBeenCalledWith(new BitstreamFormatsRegistryDeselectAllAction());
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new BitstreamFormatsRegistryDeselectAllAction());
     });
   });
 

src/app/core/data/object-updates/object-updates.service.spec.ts

@@ -70,7 +70,7 @@ describe('ObjectUpdatesService', () => {
   describe('initialize', () => {
     it('should dispatch an INITIALIZE action with the correct URL, initial identifiables and the last modified date', () => {
       service.initialize(url, identifiables, modDate);
-      expect(store.dispatch).toHaveBeenCalledWith(new InitializeFieldsAction(url, identifiables, modDate));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new InitializeFieldsAction(url, identifiables, modDate));
     });
   });
 
@@ -168,34 +168,34 @@ describe('ObjectUpdatesService', () => {
   describe('setEditableFieldUpdate', () => {
     it('should dispatch a SetEditableFieldUpdateAction action with the correct URL, uuid and true when true was set', () => {
       service.setEditableFieldUpdate(url, identifiable1.uuid, true);
-      expect(store.dispatch).toHaveBeenCalledWith(new SetEditableFieldUpdateAction(url, identifiable1.uuid, true));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new SetEditableFieldUpdateAction(url, identifiable1.uuid, true));
     });
 
     it('should dispatch an SetEditableFieldUpdateAction action with the correct URL, uuid and false when false was set', () => {
       service.setEditableFieldUpdate(url, identifiable1.uuid, false);
-      expect(store.dispatch).toHaveBeenCalledWith(new SetEditableFieldUpdateAction(url, identifiable1.uuid, false));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new SetEditableFieldUpdateAction(url, identifiable1.uuid, false));
     });
   });
 
   describe('discardFieldUpdates', () => {
     it('should dispatch a DiscardObjectUpdatesAction action with the correct URL and passed notification ', () => {
       const undoNotification = new Notification('id', NotificationType.Info, 'undo');
       service.discardFieldUpdates(url, undoNotification);
-      expect(store.dispatch).toHaveBeenCalledWith(new DiscardObjectUpdatesAction(url, undoNotification));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new DiscardObjectUpdatesAction(url, undoNotification));
     });
   });
 
   describe('reinstateFieldUpdates', () => {
     it('should dispatch a ReinstateObjectUpdatesAction action with the correct URL ', () => {
       service.reinstateFieldUpdates(url);
-      expect(store.dispatch).toHaveBeenCalledWith(new ReinstateObjectUpdatesAction(url));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new ReinstateObjectUpdatesAction(url));
     });
   });
 
   describe('removeSingleFieldUpdate', () => {
     it('should dispatch a RemoveFieldUpdateAction action with the correct URL and uuid', () => {
       service.removeSingleFieldUpdate(url, identifiable1.uuid);
-      expect(store.dispatch).toHaveBeenCalledWith(new RemoveFieldUpdateAction(url, identifiable1.uuid));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new RemoveFieldUpdateAction(url, identifiable1.uuid));
     });
   });
 
@@ -287,7 +287,7 @@ describe('ObjectUpdatesService', () => {
   describe('setSelectedVirtualMetadata', () => {
     it('should dispatch a SELECT_VIRTUAL_METADATA action with the correct URL, relationship, identifiable and boolean', () => {
       service.setSelectedVirtualMetadata(url, relationship.uuid, identifiable1.uuid, true);
-      expect(store.dispatch).toHaveBeenCalledWith(new SelectVirtualMetadataAction(url, relationship.uuid, identifiable1.uuid, true));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new SelectVirtualMetadataAction(url, relationship.uuid, identifiable1.uuid, true));
     });
   });
 

src/app/core/data/request.service.spec.ts

@@ -690,7 +690,7 @@ describe('RequestService', () => {
       service.setStaleByHref(href).subscribe(() => {
         const requestStaleAction = new RequestStaleAction(uuid);
         requestStaleAction.lastUpdated = jasmine.any(Number) as any;
-        expect(store.dispatch).toHaveBeenCalledWith(requestStaleAction);
+        expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(requestStaleAction);
         done();
       });
     });

src/app/core/eperson/eperson-data.service.spec.ts

@@ -343,14 +343,14 @@ describe('EPersonDataService', () => {
   describe('cancelEditEPerson', () => {
     it('should dispatch a CANCEL_EDIT_EPERSON action', () => {
       service.cancelEditEPerson();
-      expect(store.dispatch).toHaveBeenCalledWith(new EPeopleRegistryCancelEPersonAction());
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new EPeopleRegistryCancelEPersonAction());
     });
   });
 
   describe('editEPerson', () => {
     it('should dispatch a EDIT_EPERSON action with the EPerson to start editing', () => {
       service.editEPerson(EPersonMock);
-      expect(store.dispatch).toHaveBeenCalledWith(new EPeopleRegistryEditEPersonAction(EPersonMock));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new EPeopleRegistryEditEPersonAction(EPersonMock));
     });
   });
 

src/app/core/eperson/group-data.service.spec.ts

@@ -270,14 +270,14 @@ describe('GroupDataService', () => {
   describe('editGroup', () => {
     it('should dispatch a EDIT_GROUP action with the group to start editing', () => {
       service.editGroup(GroupMock);
-      expect(store.dispatch).toHaveBeenCalledWith(new GroupRegistryEditGroupAction(GroupMock));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new GroupRegistryEditGroupAction(GroupMock));
     });
   });
 
   describe('cancelEditGroup', () => {
     it('should dispatch a CANCEL_EDIT_GROUP action', () => {
       service.cancelEditGroup();
-      expect(store.dispatch).toHaveBeenCalledWith(new GroupRegistryCancelGroupAction());
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new GroupRegistryCancelGroupAction());
     });
   });
 });

src/app/core/shared/search/search-filter.service.spec.ts

@@ -70,7 +70,7 @@ describe('SearchFilterService', () => {
     });
 
     it('SearchFilterInitializeAction should be dispatched to the store', () => {
-      expect(store.dispatch).toHaveBeenCalledWith(new SearchFilterInitializeAction(mockFilterConfig));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new SearchFilterInitializeAction(mockFilterConfig));
     });
   });
 
@@ -80,7 +80,7 @@ describe('SearchFilterService', () => {
     });
 
     it('SearchFilterCollapseAction should be dispatched to the store', () => {
-      expect(store.dispatch).toHaveBeenCalledWith(new SearchFilterCollapseAction(mockFilterConfig.name));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new SearchFilterCollapseAction(mockFilterConfig.name));
     });
 
   });
@@ -91,7 +91,7 @@ describe('SearchFilterService', () => {
     });
 
     it('SearchFilterInitialExpandAction should be dispatched to the store', () => {
-      expect(store.dispatch).toHaveBeenCalledWith(new SearchFilterToggleAction(mockFilterConfig.name));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new SearchFilterToggleAction(mockFilterConfig.name));
     });
   });
 
@@ -101,7 +101,7 @@ describe('SearchFilterService', () => {
     });
 
     it('SearchFilterDecrementPageAction should be dispatched to the store', () => {
-      expect(store.dispatch).toHaveBeenCalledWith(new SearchFilterDecrementPageAction(mockFilterConfig.name));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new SearchFilterDecrementPageAction(mockFilterConfig.name));
     });
 
   });
@@ -112,7 +112,7 @@ describe('SearchFilterService', () => {
     });
 
     it('SearchFilterCollapseAction should be dispatched to the store', () => {
-      expect(store.dispatch).toHaveBeenCalledWith(new SearchFilterIncrementPageAction(mockFilterConfig.name));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new SearchFilterIncrementPageAction(mockFilterConfig.name));
     });
 
   });
@@ -123,7 +123,7 @@ describe('SearchFilterService', () => {
     });
 
     it('SearchFilterDecrementPageAction should be dispatched to the store', () => {
-      expect(store.dispatch).toHaveBeenCalledWith(new SearchFilterResetPageAction(mockFilterConfig.name));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new SearchFilterResetPageAction(mockFilterConfig.name));
     });
 
   });
@@ -134,7 +134,7 @@ describe('SearchFilterService', () => {
     });
 
     it('SidebarExpandAction should be dispatched to the store', () => {
-      expect(store.dispatch).toHaveBeenCalledWith(new SearchFilterExpandAction(mockFilterConfig.name));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new SearchFilterExpandAction(mockFilterConfig.name));
     });
   });
 

src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts

@@ -112,7 +112,7 @@ describe('ForgotPasswordFormComponent', () => {
       comp.submit();
 
       expect(ePersonDataService.patchPasswordWithToken).toHaveBeenCalledWith('test-uuid', 'test-token', 'password');
-      expect(store.dispatch).toHaveBeenCalledWith(new AuthenticateAction('test@email.org', 'password'));
+      expect(store.dispatch as jasmine.Spy).toHaveBeenCalledWith(new AuthenticateAction('test@email.org', 'password'));
       expect(router.navigate).toHaveBeenCalledWith(['/home']);
       expect(notificationsService.success).toHaveBeenCalled();
     });