Merge branch 'master' into angular-cli

2025-10-13 21:13:07 +00:00 · 2020-04-17 16:09:12 +02:00
parent f664cf4c90 c64760b0d3
commit 92dca8d4e8
168 changed files with 15092 additions and 3223 deletions
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
@@ -1,7 +1,6 @@
 import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
-import { By } from '@angular/platform-browser';

 import { of as observableOf } from 'rxjs';
 import { cold } from 'jasmine-marbles';
@@ -16,11 +15,14 @@ import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.se
 import { ClaimedTaskActionsComponent } from './claimed-task-actions.component';
 import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model';
 import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../testing/utils';
 import { getMockSearchService } from '../../mocks/search-service.mock';
 import { getMockRequestService } from '../../mocks/request.service.mock';
 import { RequestService } from '../../../core/data/request.service';
 import { SearchService } from '../../../core/shared/search/search.service';
+import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
+import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
+import { VarDirective } from '../../utils/var.directive';

 let component: ClaimedTaskActionsComponent;
 let fixture: ComponentFixture<ClaimedTaskActionsComponent>;
@@ -30,15 +32,15 @@ let notificationsServiceStub: NotificationsServiceStub;
 let router: RouterStub;

 let mockDataService;
-
 let searchService;
-
 let requestServce;
+let workflowActionService: WorkflowActionDataService;

 let item;
 let rdItem;
 let workflowitem;
 let rdWorkflowitem;
+let workflowAction;

 function init() {
  mockDataService = jasmine.createSpyObj('ClaimedTaskDataService', {
@@ -46,9 +48,7 @@ function init() {
    rejectTask: jasmine.createSpy('rejectTask'),
    returnToPoolTask: jasmine.createSpy('returnToPoolTask'),
  });
-
  searchService = getMockSearchService();
-
  requestServce = getMockRequestService();

  item = Object.assign(new Item(), {
@@ -84,7 +84,11 @@ function init() {
  workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
  rdWorkflowitem = createSuccessfulRemoteDataObject(workflowitem);
  mockObject = Object.assign(new ClaimedTask(), { workflowitem: observableOf(rdWorkflowitem), id: '1234' });
+  workflowAction = Object.assign(new WorkflowAction(), { id: 'action-1', options: ['option-1', 'option-2'] });

+  workflowActionService = jasmine.createSpyObj('workflowActionService', {
+    findById: createSuccessfulRemoteDataObject$(workflowAction)
+  });
 }

 describe('ClaimedTaskActionsComponent', () => {
@@ -99,14 +103,15 @@ describe('ClaimedTaskActionsComponent', () => {
          }
        })
      ],
-      declarations: [ClaimedTaskActionsComponent],
+      declarations: [ClaimedTaskActionsComponent, VarDirective],
      providers: [
        { provide: Injector, useValue: {} },
        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
        { provide: Router, useValue: new RouterStub() },
        { provide: ClaimedTaskDataService, useValue: mockDataService },
        { provide: SearchService, useValue: searchService },
-        { provide: RequestService, useValue: requestServce }
+        { provide: RequestService, useValue: requestServce },
+        { provide: WorkflowActionDataService, useValue: workflowActionService }
      ],
      schemas: [NO_ERRORS_SCHEMA]
    }).overrideComponent(ClaimedTaskActionsComponent, {
@@ -123,11 +128,6 @@ describe('ClaimedTaskActionsComponent', () => {
    fixture.detectChanges();
  });

-  afterEach(() => {
-    fixture = null;
-    component = null;
-  });
-
  it('should init objects properly', () => {
    component.object = null;
    component.initObjects(mockObject);
@@ -136,46 +136,14 @@ describe('ClaimedTaskActionsComponent', () => {

    expect(component.workflowitem$).toBeObservable(cold('(b|)', {
      b: rdWorkflowitem.payload
-    }))
+    }));
  });

-  it('should display edit task button', () => {
-    const btn = fixture.debugElement.query(By.css('.btn-info'));
-
-    expect(btn).toBeDefined();
-  });
-
-  it('should call approveTask method when approving a task', fakeAsync(() => {
-    spyOn(component, 'reload');
-    mockDataService.approveTask.and.returnValue(observableOf({hasSucceeded: true}));
-
-    component.approve();
-    fixture.detectChanges();
-
-    fixture.whenStable().then(() => {
-      expect(mockDataService.approveTask).toHaveBeenCalledWith(mockObject.id);
-    });
-
-  }));
-
-  it('should display a success notification on approve success', async(() => {
-    spyOn(component, 'reload');
-    mockDataService.approveTask.and.returnValue(observableOf({hasSucceeded: true}));
-
-    component.approve();
-    fixture.detectChanges();
-
-    fixture.whenStable().then(() => {
-      expect(notificationsServiceStub.success).toHaveBeenCalled();
-    });
-  }));
-
-  it('should reload page on approve success', async(() => {
+  it('should reload page on process completed', async(() => {
    spyOn(router, 'navigateByUrl');
    router.url = 'test.url/test';
-    mockDataService.approveTask.and.returnValue(observableOf({hasSucceeded: true}));

-    component.approve();
+    component.handleActionResponse(true);
    fixture.detectChanges();

    fixture.whenStable().then(() => {
@@ -183,108 +151,8 @@ describe('ClaimedTaskActionsComponent', () => {
    });
  }));

-  it('should display an error notification on approve failure', async(() => {
-    mockDataService.approveTask.and.returnValue(observableOf({hasSucceeded: false}));
-
-    component.approve();
-    fixture.detectChanges();
-
-    fixture.whenStable().then(() => {
-      expect(notificationsServiceStub.error).toHaveBeenCalled();
-    });
-  }));
-
-  it('should call rejectTask method when rejecting a task', fakeAsync(() => {
-    spyOn(component, 'reload');
-    mockDataService.rejectTask.and.returnValue(observableOf({hasSucceeded: true}));
-
-    component.reject('test reject');
-    fixture.detectChanges();
-
-    fixture.whenStable().then(() => {
-      expect(mockDataService.rejectTask).toHaveBeenCalledWith('test reject', mockObject.id);
-    });
-
-  }));
-
-  it('should display a success notification on reject success', async(() => {
-    spyOn(component, 'reload');
-    mockDataService.rejectTask.and.returnValue(observableOf({hasSucceeded: true}));
-
-    component.reject('test reject');
-    fixture.detectChanges();
-
-    fixture.whenStable().then(() => {
-      expect(notificationsServiceStub.success).toHaveBeenCalled();
-    });
-  }));
-
-  it('should reload page on reject success', async(() => {
-    spyOn(router, 'navigateByUrl');
-    router.url = 'test.url/test';
-    mockDataService.rejectTask.and.returnValue(observableOf({hasSucceeded: true}));
-
-    component.reject('test reject');
-    fixture.detectChanges();
-
-    fixture.whenStable().then(() => {
-      expect(router.navigateByUrl).toHaveBeenCalledWith('test.url/test');
-    });
-  }));
-
-  it('should display an error notification on reject failure', async(() => {
-    mockDataService.rejectTask.and.returnValue(observableOf({hasSucceeded: false}));
-
-    component.reject('test reject');
-    fixture.detectChanges();
-
-    fixture.whenStable().then(() => {
-      expect(notificationsServiceStub.error).toHaveBeenCalled();
-    });
-  }));
-
-  it('should call returnToPoolTask method when returning a task to pool', fakeAsync(() => {
-    spyOn(component, 'reload');
-    mockDataService.returnToPoolTask.and.returnValue(observableOf({hasSucceeded: true}));
-
-    component.returnToPool();
-    fixture.detectChanges();
-
-    fixture.whenStable().then(() => {
-      expect(mockDataService.returnToPoolTask).toHaveBeenCalledWith( mockObject.id);
-    });
-
-  }));
-
-  it('should display a success notification on return to pool success', async(() => {
-    spyOn(component, 'reload');
-    mockDataService.returnToPoolTask.and.returnValue(observableOf({hasSucceeded: true}));
-
-    component.returnToPool();
-    fixture.detectChanges();
-
-    fixture.whenStable().then(() => {
-      expect(notificationsServiceStub.success).toHaveBeenCalled();
-    });
-  }));
-
-  it('should reload page on return to pool success', async(() => {
-    spyOn(router, 'navigateByUrl');
-    router.url = 'test.url/test';
-    mockDataService.returnToPoolTask.and.returnValue(observableOf({hasSucceeded: true}));
-
-    component.returnToPool();
-    fixture.detectChanges();
-
-    fixture.whenStable().then(() => {
-      expect(router.navigateByUrl).toHaveBeenCalledWith('test.url/test');
-    });
-  }));
-
-  it('should display an error notification on return to pool failure', async(() => {
-    mockDataService.returnToPoolTask.and.returnValue(observableOf({hasSucceeded: false}));
-
-    component.returnToPool();
+  it('should display an error notification on process failure', async(() => {
+    component.handleActionResponse(false);
    fixture.detectChanges();

    fixture.whenStable().then(() => {