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

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

Browse Source 
# Conflicts:
#	src/app/+search-page/search-service/search.service.spec.ts
#	src/app/app.component.spec.ts
#	src/app/app.component.ts
#	src/app/core/auth/auth-response-parsing.service.ts
#	src/app/core/cache/models/normalized-object-factory.ts
#	src/app/core/cache/models/normalized-resource-policy.model.ts
#	src/app/core/core.module.ts
#	src/app/core/data/base-response-parsing.service.ts
#	src/app/core/data/config-response-parsing.service.spec.ts
#	src/app/core/data/config-response-parsing.service.ts
#	src/app/core/data/dso-response-parsing.service.ts
#	src/app/core/data/request.models.ts
#	src/app/core/data/search-response-parsing.service.ts
#	src/app/core/integration/integration-response-parsing.service.spec.ts
#	src/app/core/integration/integration-response-parsing.service.ts
#	src/app/core/shared/item.model.ts
#	src/app/core/shared/resource-policy.model.ts
#	src/app/core/shared/resource-type.ts
#	src/app/shared/shared.module.ts
#	src/app/thumbnail/thumbnail.component.html
This commit is contained in:
Giuseppe
2018-10-15 19:21:01 +02:00
parent 507020db7b 8c124f227d
commit b27e3d9e2f
255 changed files with 7005 additions and 1317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/app.component.spec.ts
View File

@@ -34,8 +34,8 @@ import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
import { AngularticsMock } from './shared/mocks/mock-angulartics.service';
import { AuthServiceMock } from './shared/mocks/mock-auth.service';
import { AuthService } from './core/auth/auth.service';
import { RouteService } from './shared/services/route.service';
import { ActivatedRoute, Router } from '@angular/router';
import { RouteService } from './shared/services/route.service';
import { MockActivatedRoute } from './shared/mocks/mock-active-router';
import { MockRouter } from './shared/mocks/mock-router';
@@ -66,8 +66,8 @@ describe('App component', () => {
{ provide: MetadataService, useValue: new MockMetadataService() },
{ provide: Angulartics2GoogleAnalytics, useValue: new AngularticsMock() },
{ provide: AuthService, useValue: new AuthServiceMock() },
{ provide: ActivatedRoute, useValue: new MockActivatedRoute() },
{ provide: Router, useValue: new MockRouter() },
{ provide: ActivatedRoute, useValue: new MockActivatedRoute() },
AppComponent,
RouteService
],