Merge branch 'master' into w2p-62355_optimize-search-performance

src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts

@@ -4,7 +4,6 @@ import { RouteService } from '../../../core/services/route.service';
 import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
 import { Community } from '../../../core/shared/community.model';
 import { SharedModule } from '../../shared.module';
 import { CommonModule } from '@angular/common';
@@ -13,6 +12,10 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { CreateComColPageComponent } from './create-comcol-page.component';
 import { DataService } from '../../../core/data/data.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$
+} from '../../testing/utils';
 
 describe('CreateComColPageComponent', () => {
   let comp: CreateComColPageComponent<DSpaceObject>;
@@ -46,14 +49,14 @@ describe('CreateComColPageComponent', () => {
     });
 
     communityDataServiceStub = {
-      findById: (uuid) => observableOf(new RemoteData(false, false, true, null, Object.assign(new Community(), {
+      findById: (uuid) => createSuccessfulRemoteDataObject$(Object.assign(new Community(), {
         uuid: uuid,
         metadata: [{
           key: 'dc.title',
           value: community.name
         }]
-      }))),
-      create: (com, uuid?) => observableOf(new RemoteData(false, false, true, undefined, newCommunity))
+      })),
+      create: (com, uuid?) => createSuccessfulRemoteDataObject$(newCommunity)
 
     };
 
@@ -109,7 +112,7 @@ describe('CreateComColPageComponent', () => {
 
     it('should not navigate on failure', () => {
       spyOn(router, 'navigate');
-      spyOn(dsoDataService, 'create').and.returnValue(observableOf(new RemoteData(true, true, false, undefined, newCommunity)));
+      spyOn(dsoDataService, 'create').and.returnValue(createFailedRemoteDataObject$(newCommunity));
       comp.onSubmit(data);
       fixture.detectChanges();
       expect(router.navigate).not.toHaveBeenCalled();