hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-09 19:13:08 +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

6
src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts
View File

@@ -13,14 +13,14 @@ import { NotificationsServiceStub } from '../../testing/notifications-service-st
import { RouterStub } from '../../testing/router-stub';
import { RemoteData } from '../../../core/data/remote-data';
import { Item } from '../../../core/shared/item.model';
import { Workspaceitem } from '../../../core/submission/models/workspaceitem.model';
import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
import { WorkspaceitemActionsComponent } from './workspaceitem-actions.component';
import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
let component: WorkspaceitemActionsComponent;
let fixture: ComponentFixture<WorkspaceitemActionsComponent>;
let mockObject: Workspaceitem;
let mockObject: WorkspaceItem;
let notificationsServiceStub: NotificationsServiceStub;
const mockDataService = jasmine.createSpyObj('WorkspaceitemDataService', {
@@ -57,7 +57,7 @@ const item = Object.assign(new Item(), {
}
});
const rd = new RemoteData(false, false, true, null, item);
mockObject = Object.assign(new Workspaceitem(), { item: observableOf(rd), id: '1234', uuid: '1234' });
mockObject = Object.assign(new WorkspaceItem(), { item: observableOf(rd), id: '1234', uuid: '1234' });
describe('WorkspaceitemActionsComponent', () => {
beforeEach(async(() => {