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

Merge remote-tracking branch 'remotes/origin/master' into submission

Browse Source 
# Conflicts:
#	src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts
#	src/app/core/cache/builders/remote-data-build.service.ts
#	src/app/core/core.effects.ts
#	src/app/core/core.reducers.ts
#	src/app/core/data/comcol-data.service.spec.ts
#	src/app/core/data/data.service.spec.ts
#	src/app/core/data/data.service.ts
#	src/app/core/shared/dspace-object.model.ts
#	src/app/shared/shared.module.ts
#	src/styles/_custom_variables.scss
This commit is contained in:
Giuseppe Digilio
2019-03-08 09:52:47 +01:00
parent 167c50e9a3 cebea75605
commit ab42f4b190
123 changed files with 3987 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts
View File

@@ -9,15 +9,14 @@ import { CommonModule } from '@angular/common';
import { RouterTestingModule } from '@angular/router/testing';
import { NO_ERRORS_SCHEMA } from '@angular/core';
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
import { NormalizedDSpaceObject } from '../../../core/cache/models/normalized-dspace-object.model';
import { DataService } from '../../../core/data/data.service';
import { DeleteComColPageComponent } from './delete-comcol-page.component';
import { NotificationsService } from '../../notifications/notifications.service';
import { NotificationsServiceStub } from '../../testing/notifications-service-stub';
describe('DeleteComColPageComponent', () => {
let comp: DeleteComColPageComponent<DSpaceObject, NormalizedDSpaceObject>;
let fixture: ComponentFixture<DeleteComColPageComponent<DSpaceObject, NormalizedDSpaceObject>>;
let comp: DeleteComColPageComponent<DSpaceObject>;
let fixture: ComponentFixture<DeleteComColPageComponent<DSpaceObject>>;
let dsoDataService: CommunityDataService;
let router: Router;