hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 15:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

61949: merged master, resolving conflicts

Browse Source
This commit is contained in:
lotte
2019-05-24 16:57:38 +02:00
parent 233909d6ca
commit a0a0830e5f
41 changed files with 130 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.spec.ts
View File

@@ -7,7 +7,7 @@ import { cold } from 'jasmine-marbles';
import { RemoteData } from '../../../../core/data/remote-data';
import { ItemSubmitterComponent } from './item-submitter.component';
import { Workflowitem } from '../../../../core/submission/models/workflowitem.model';
import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
import { EPersonMock } from '../../../testing/eperson-mock';
import { MockTranslateLoader } from '../../../mocks/mock-translate-loader';
@@ -21,7 +21,7 @@ const compIndex = 1;
let mockResultObject: PoolTask;
const rdSumbitter = new RemoteData(false, false, true, null, EPersonMock);
const workflowitem = Object.assign(new Workflowitem(), { submitter: observableOf(rdSumbitter) });
const workflowitem = Object.assign(new WorkflowItem(), { submitter: observableOf(rdSumbitter) });
const rdWorkflowitem = new RemoteData(false, false, true, null, workflowitem);
mockResultObject = Object.assign(new PoolTask(), { workflowitem: observableOf(rdWorkflowitem) });