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

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
433 changed files with 14771 additions and 4389 deletions

View File

@@ -17,6 +17,10 @@ import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.mod
import { WorkspaceitemActionsComponent } from './workspaceitem-actions.component';
import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
import { createSuccessfulRemoteDataObject } from '../../testing/utils';
import { RequestService } from '../../../core/data/request.service';
import { getMockRequestService } from '../../mocks/mock-request.service';
import { SearchService } from '../../../+search-page/search-service/search.service';
import { getMockSearchService } from '../../mocks/mock-search-service';
let component: WorkspaceitemActionsComponent;
let fixture: ComponentFixture<WorkspaceitemActionsComponent>;
@@ -28,8 +32,12 @@ const mockDataService = jasmine.createSpyObj('WorkspaceitemDataService', {
delete: jasmine.createSpy('delete')
});
const searchService = getMockSearchService();
const requestServce = getMockRequestService();
const item = Object.assign(new Item(), {
bitstreams: observableOf({}),
bundles: observableOf({}),
metadata: {
'dc.title': [
{
@@ -62,6 +70,7 @@ mockObject = Object.assign(new WorkspaceItem(), { item: observableOf(rd), id: '1
describe('WorkspaceitemActionsComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
NgbModule.forRoot(),
@@ -78,6 +87,8 @@ describe('WorkspaceitemActionsComponent', () => {
{ provide: NotificationsService, useValue: new NotificationsServiceStub() },
{ provide: Router, useValue: new RouterStub() },
{ provide: WorkspaceitemDataService, useValue: mockDataService },
{ provide: SearchService, useValue: searchService },
{ provide: RequestService, useValue: requestServce },
NgbModal
],
schemas: [NO_ERRORS_SCHEMA]
@@ -161,4 +172,14 @@ describe('WorkspaceitemActionsComponent', () => {
expect(notificationsServiceStub.error).toHaveBeenCalled();
});
}));
it('should clear the object cache by href', async(() => {
component.reload();
fixture.detectChanges();
fixture.whenStable().then(() => {
expect(searchService.getEndpoint).toHaveBeenCalled();
expect(requestServce.removeByHrefSubstring).toHaveBeenCalledWith('discover/search/objects');
});
}));
});