[DURACOM-383] update test

Author: Micheleboychuk

src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts

@@ -50,7 +50,7 @@ describe('DeleteCollectionPageComponent', () => {
     scriptService = jasmine.createSpyObj('scriptService', {
       invoke: createSuccessfulRemoteDataObject$({ processId: '123' }),
     });
-    router = jasmine.createSpyObj('router', ['navigateByUrl']);
+    router = jasmine.createSpyObj('router', ['navigateByUrl', 'navigate']);
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), CommonModule, RouterTestingModule, DeleteCollectionPageComponent],
       providers: [
@@ -85,14 +85,24 @@ describe('DeleteCollectionPageComponent', () => {
         Object.assign(new ProcessParameter(), { name: '-i', value: mockCollection.uuid }),
       ];
       (scriptService.invoke as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$({ processId: '123' }));
-      expect(scriptService.invoke).toHaveBeenCalledWith(DSPACE_OBJECT_DELETION_SCRIPT_NAME, parameterValues, []);
-      expect(notificationService.success).toHaveBeenCalledWith('collection.delete.notification.success');
-      expect(router.navigateByUrl).toHaveBeenCalledWith(getProcessDetailRoute('123'));
+      comp.onConfirm(mockCollection);
+      setTimeout(() => {
+        expect(scriptService.invoke).toHaveBeenCalledWith(DSPACE_OBJECT_DELETION_SCRIPT_NAME, parameterValues, []);
+        expect(notificationService.success).toHaveBeenCalledWith('collection.delete.notification.success');
+        expect(router.navigateByUrl).toHaveBeenCalledWith(getProcessDetailRoute('123'));
+        done();
+      }, 0);
     });
 
     it('error notification is shown', (done) => {
       (scriptService.invoke as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Error', 500));
-      expect(notificationService.error).toHaveBeenCalledWith('collection.delete.notification.fail');
+      comp.onConfirm(mockCollection);
+      setTimeout(() => {
+        expect(notificationService.error).toHaveBeenCalledWith('collection.delete.notification.fail');
+        expect(router.navigate).toHaveBeenCalledWith(['/']);
+        done();
+      }, 0);
     });
   });
+
 });

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

@@ -19,11 +19,14 @@ import { of } from 'rxjs';
 
 import { ComColDataService } from '../../../../core/data/comcol-data.service';
 import { CommunityDataService } from '../../../../core/data/community-data.service';
+import { ScriptDataService } from '../../../../core/data/processes/script-data.service';
 import { Community } from '../../../../core/shared/community.model';
+import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import {
   createFailedRemoteDataObject$,
   createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
 } from '../../../remote-data.utils';
 import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
 import { DeleteComColPageComponent } from './delete-comcol-page.component';
@@ -41,9 +44,8 @@ describe('DeleteComColPageComponent', () => {
   let routeStub;
   let notificationsService;
   let translateServiceStub;
-  let requestServiceStub;
-
   let scheduler;
+  let scriptService;
 
   const validUUID = 'valid-uuid';
   const invalidUUID = 'invalid-uuid';
@@ -98,11 +100,16 @@ describe('DeleteComColPageComponent', () => {
 
   beforeEach(waitForAsync(() => {
     initializeVars();
+    scriptService = jasmine.createSpyObj('scriptService', {
+      invoke: createSuccessfulRemoteDataObject$({ processId: '123' }),
+    });
+    router = jasmine.createSpyObj('router', ['navigateByUrl', 'navigate']);
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), CommonModule, RouterTestingModule],
       providers: [
         { provide: ComColDataService, useValue: dsoDataService },
-        { provide: Router, useValue: routerStub },
+        { provide: ScriptDataService, useValue: scriptService },
+        { provide: Router, useValue: router },
         { provide: ActivatedRoute, useValue: routeStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: TranslateService, useValue: translateServiceStub },
@@ -159,8 +166,7 @@ describe('DeleteComColPageComponent', () => {
     });
 
     it('should show an error notification on failure', () => {
-      (dsoDataService.delete as any).and.returnValue(createFailedRemoteDataObject$('Error', 500));
-      spyOn(router, 'navigate');
+      (scriptService.invoke as any).and.returnValue(createFailedRemoteDataObject$('Error', 500));
       scheduler.schedule(() => comp.onConfirm(data2));
       scheduler.flush();
       fixture.detectChanges();
@@ -169,18 +175,17 @@ describe('DeleteComColPageComponent', () => {
     });
 
     it('should show a success notification on success and navigate', () => {
-      spyOn(router, 'navigate');
       scheduler.schedule(() => comp.onConfirm(data1));
       scheduler.flush();
       fixture.detectChanges();
       expect(notificationsService.success).toHaveBeenCalled();
-      expect(router.navigate).toHaveBeenCalled();
+      expect(router.navigateByUrl).toHaveBeenCalledWith(getProcessDetailRoute('123'));
     });
 
-    it('should call delete on the data service', () => {
+    it('should call script service invoke', () => {
       comp.onConfirm(data1);
       fixture.detectChanges();
-      expect(dsoDataService.delete).toHaveBeenCalledWith(data1.id);
+      expect(scriptService.invoke).toHaveBeenCalled();
     });
   });
 
@@ -198,7 +203,6 @@ describe('DeleteComColPageComponent', () => {
 
     it('should redirect to the edit page', () => {
       const redirectURL = frontendURL + '/' + validUUID + '/edit';
-      spyOn(router, 'navigate');
       comp.onCancel(data1);
       fixture.detectChanges();
       expect(router.navigate).toHaveBeenCalledWith([redirectURL]);