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

Merge branch 'master' into Login-as-EPerson

Browse Source 
Conflicts:
	src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
	src/app/core/auth/auth.service.spec.ts
	src/app/profile-page/profile-page.component.spec.ts
This commit is contained in:
Kristof De Langhe
2020-05-12 16:54:40 +02:00
parent df2cc22172 33be8a4a91
commit f548d5bf20
565 changed files with 31292 additions and 13539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
View File

@@ -7,9 +7,9 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
import { UserMenuComponent } from './user-menu.component';
import { authReducer, AuthState } from '../../../core/auth/auth.reducer';
import { AuthTokenInfo } from '../../../core/auth/models/auth-token-info.model';
import { EPersonMock } from '../../testing/eperson-mock';
import { AppState } from '../../../app.reducer';
import { MockTranslateLoader } from '../../mocks/mock-translate-loader';
import { EPersonMock } from '../../testing/eperson.mock';
import { AppState, storeModuleConfig } from '../../../app.reducer';
import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
import { cold } from 'jasmine-marbles';
import { By } from '@angular/platform-browser';
import { AuthService } from '../../../core/auth/auth.service';
@@ -51,11 +51,16 @@ describe('UserMenuComponent', () => {
serviceInit();
TestBed.configureTestingModule({
imports: [
StoreModule.forRoot(authReducer),
StoreModule.forRoot(authReducer, {
runtimeChecks: {
strictStateImmutability: false,
strictActionImmutability: false
}
}),
TranslateModule.forRoot({
loader: {
provide: TranslateLoader,
useClass: MockTranslateLoader
useClass: TranslateLoaderMock
}
})
],