hazza/yel-dspace-angular
1
0
Fork 0
forked from hazza/dspace-angular
Code Pull Requests 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

10
src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts
View File

@@ -9,16 +9,16 @@ import { MockTranslateLoader } from '../../mocks/mock-translate-loader';
import { RouterStub } from '../../testing/router-stub';
import { RemoteData } from '../../../core/data/remote-data';
import { Item } from '../../../core/shared/item.model';
import { Workflowitem } from '../../../core/submission/models/workflowitem.model';
import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
import { WorkflowitemActionsComponent } from './workflowitem-actions.component';
import { WorkflowitemDataService } from '../../../core/submission/workflowitem-data.service';
import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
import { NotificationsService } from '../../notifications/notifications.service';
import { NotificationsServiceStub } from '../../testing/notifications-service-stub';
let component: WorkflowitemActionsComponent;
let fixture: ComponentFixture<WorkflowitemActionsComponent>;
let mockObject: Workflowitem;
let mockObject: WorkflowItem;
const mockDataService = {};
@@ -52,7 +52,7 @@ const item = Object.assign(new Item(), {
}
});
const rd = new RemoteData(false, false, true, null, item);
mockObject = Object.assign(new Workflowitem(), { item: observableOf(rd), id: '1234', uuid: '1234' });
mockObject = Object.assign(new WorkflowItem(), { item: observableOf(rd), id: '1234', uuid: '1234' });
describe('WorkflowitemActionsComponent', () => {
beforeEach(async(() => {
@@ -69,7 +69,7 @@ describe('WorkflowitemActionsComponent', () => {
providers: [
{ provide: Injector, useValue: {} },
{ provide: Router, useValue: new RouterStub() },
{ provide: WorkflowitemDataService, useValue: mockDataService },
{ provide: WorkflowItemDataService, useValue: mockDataService },
{ provide: NotificationsService, useValue: new NotificationsServiceStub() },
],
schemas: [NO_ERRORS_SCHEMA]