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

Merge branch 'master' into w2p-65572_Add-support-for-bundles

Browse Source 
Conflicts:
	src/app/core/shared/item.model.ts
	src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts
	src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts
	src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts
	src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts
	src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts
	src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts
	src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts
	src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts
	src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-list-element.component.spec.ts
	src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts
	src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts
	src/app/shared/object-grid/item-grid-element/item-grid-element.component.spec.ts
	src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.spec.ts
	src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.spec.ts
	src/app/shared/testing/utils.ts
This commit is contained in:
Kristof De Langhe
2019-11-21 14:14:39 +01:00
parent 77826beb2a 981c915975
commit ed3f7dfc7b
433 changed files with 14771 additions and 4389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
View File

@@ -18,6 +18,10 @@ import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.mode
import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
import { createSuccessfulRemoteDataObject } from '../../testing/utils';
import { CoreModule } from '../../../core/core.module';
import { getMockSearchService } from '../../mocks/mock-search-service';
import { getMockRequestService } from '../../mocks/mock-request.service';
import { SearchService } from '../../../+search-page/search-service/search.service';
import { RequestService } from '../../../core/data/request.service';
let component: ClaimedTaskActionsComponent;
let fixture: ComponentFixture<ClaimedTaskActionsComponent>;
@@ -32,8 +36,12 @@ const mockDataService = jasmine.createSpyObj('ClaimedTaskDataService', {
returnToPoolTask: jasmine.createSpy('returnToPoolTask'),
});
const searchService = getMockSearchService();
const requestServce = getMockRequestService();
const item = Object.assign(new Item(), {
bitstreams: observableOf({}),
bundles: observableOf({}),
metadata: {
'dc.title': [
{
@@ -83,6 +91,8 @@ describe('ClaimedTaskActionsComponent', () => {
{ provide: NotificationsService, useValue: new NotificationsServiceStub() },
{ provide: Router, useValue: new RouterStub() },
{ provide: ClaimedTaskDataService, useValue: mockDataService },
{ provide: SearchService, useValue: searchService },
{ provide: RequestService, useValue: requestServce }
],
schemas: [NO_ERRORS_SCHEMA]
}).overrideComponent(ClaimedTaskActionsComponent, {