From 64b6a11a28b9b11a015db7a97d53e8b850691f7f Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Tue, 8 Jan 2019 12:21:41 -0700 Subject: [PATCH] SHIBUI-1031 Fixed tests --- ui/src/app/core/effect/user.effect.spec.ts | 29 ++++++++--------- ui/src/app/core/effect/user.effect.ts | 12 ------- ui/src/app/core/reducer/index.spec.ts | 4 ++- ui/src/app/core/service/user.service.spec.ts | 5 ++- ui/src/app/core/service/user.service.ts | 12 ------- .../model/dynamic-http.provider.form.spec.ts | 5 ++- .../admin/reducer/collection.reducer.spec.ts | 24 ++++++-------- .../user/admin/service/admin.service.spec.ts | 32 ++++++++----------- 8 files changed, 48 insertions(+), 75 deletions(-) diff --git a/ui/src/app/core/effect/user.effect.spec.ts b/ui/src/app/core/effect/user.effect.spec.ts index 9e67b9665..ac5827ae4 100644 --- a/ui/src/app/core/effect/user.effect.spec.ts +++ b/ui/src/app/core/effect/user.effect.spec.ts @@ -3,14 +3,10 @@ import { provideMockActions } from '@ngrx/effects/testing'; import { ReplaySubject } from 'rxjs/ReplaySubject'; import { UserEffects } from './user.effect'; -import { - UserLoadRequestAction, - UserLoadSuccessAction, - UserLoadErrorAction -} from '../action/user.action'; import { Subject, of, throwError } from 'rxjs'; import { UserService } from '../service/user.service'; -import { User } from '../model/user'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { LoadRoleSuccess, LoadRoleFail, LoadRoleRequest } from '../action/configuration.action'; describe('User Effects', () => { let effects: UserEffects; @@ -19,7 +15,9 @@ describe('User Effects', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [], + imports: [ + HttpClientTestingModule + ], providers: [ UserEffects, UserService, @@ -32,26 +30,25 @@ describe('User Effects', () => { }); it('should fire a success action', () => { - let user = {}; - spyOn(userService, 'get').and.returnValue(of(user)); + spyOn(userService, 'getRoles').and.returnValue(of(['ROLE_ADMIN'])); actions = new ReplaySubject(1); - actions.next(new UserLoadRequestAction()); + actions.next(new LoadRoleRequest()); - effects.loadUser$.subscribe(result => { - expect(result).toEqual(new UserLoadSuccessAction(user as User)); + effects.loadRoles$.subscribe(result => { + expect(result).toEqual(new LoadRoleSuccess(['ROLE_ADMIN'])); }); }); it('should fire an error action', () => { let err = new Error('404'); - spyOn(userService, 'get').and.returnValue(throwError(err)); + spyOn(userService, 'getRoles').and.returnValue(throwError(err)); actions = new ReplaySubject(1); - actions.next(new UserLoadRequestAction()); + actions.next(new LoadRoleRequest()); - effects.loadUser$.subscribe(result => { - expect(result).toEqual(new UserLoadErrorAction(err)); + effects.loadRoles$.subscribe(result => { + expect(result).toEqual(new LoadRoleFail()); }); }); }); diff --git a/ui/src/app/core/effect/user.effect.ts b/ui/src/app/core/effect/user.effect.ts index 42cc412ba..095267bff 100644 --- a/ui/src/app/core/effect/user.effect.ts +++ b/ui/src/app/core/effect/user.effect.ts @@ -11,18 +11,6 @@ import { UserService } from '../service/user.service'; @Injectable() export class UserEffects { - @Effect() - loadUser$ = this.actions$.pipe( - ofType(user.USER_LOAD_REQUEST), - switchMap(() => - this.userService.get() - .pipe( - map(u => new user.UserLoadSuccessAction({ ...u })), - catchError(error => of(new user.UserLoadErrorAction(error))) - ) - ) - ); - @Effect() loadRoles$ = this.actions$.pipe( ofType(ConfigurationActionTypes.LOAD_ROLE_REQUEST), diff --git a/ui/src/app/core/reducer/index.spec.ts b/ui/src/app/core/reducer/index.spec.ts index b6336a397..f14a08006 100644 --- a/ui/src/app/core/reducer/index.spec.ts +++ b/ui/src/app/core/reducer/index.spec.ts @@ -1,12 +1,14 @@ import * as fromIndex from './index'; import * as fromUser from './user.reducer'; import * as fromVersion from './version.reducer'; +import * as fromConfig from './configuration.reducer'; import { VersionInfo } from '../model/version'; describe('Core index reducers', () => { const state: fromIndex.CoreState = { user: fromUser.initialState as fromUser.UserState, - version: fromVersion.initialState as fromVersion.VersionState + version: fromVersion.initialState as fromVersion.VersionState, + config: fromConfig.initialState as fromConfig.ConfigState }; describe('getUserStateFn function', () => { diff --git a/ui/src/app/core/service/user.service.spec.ts b/ui/src/app/core/service/user.service.spec.ts index 62ef7e5ad..55bad9bab 100644 --- a/ui/src/app/core/service/user.service.spec.ts +++ b/ui/src/app/core/service/user.service.spec.ts @@ -1,13 +1,16 @@ import { TestBed, async, inject } from '@angular/core/testing'; import { HttpModule } from '@angular/http'; import { UserService } from './user.service'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; describe('User Service', () => { let service: UserService; beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpModule], + imports: [ + HttpClientTestingModule + ], providers: [ UserService ] diff --git a/ui/src/app/core/service/user.service.ts b/ui/src/app/core/service/user.service.ts index dae49d4e3..e44e16bce 100644 --- a/ui/src/app/core/service/user.service.ts +++ b/ui/src/app/core/service/user.service.ts @@ -12,18 +12,6 @@ export class UserService { private http: HttpClient ) { } - get(): Observable { - const defUser = Object.assign({}, { - id: 'foo', - role: 'admin', - name: { - first: 'Ryan', - last: 'Mathis' - } - }); - return of(defUser); - } - getRoles(): Observable { return this.http.get( `${this.base}/supportedRoles` diff --git a/ui/src/app/metadata/provider/model/dynamic-http.provider.form.spec.ts b/ui/src/app/metadata/provider/model/dynamic-http.provider.form.spec.ts index 94d1dfe7b..bafe25f4b 100644 --- a/ui/src/app/metadata/provider/model/dynamic-http.provider.form.spec.ts +++ b/ui/src/app/metadata/provider/model/dynamic-http.provider.form.spec.ts @@ -115,7 +115,10 @@ describe('DynamicHttpMetadataProviderWizard', () => { '/', '/name', '/xmlId', - '/metadataURL' + '/metadataRequestURLConstructionScheme', + '/metadataRequestURLConstructionScheme/content', + '/metadataRequestURLConstructionScheme/@type', + '/metadataRequestURLConstructionScheme/match' ]); }); }); diff --git a/ui/src/app/user/admin/reducer/collection.reducer.spec.ts b/ui/src/app/user/admin/reducer/collection.reducer.spec.ts index df4d6df3e..ac0349889 100644 --- a/ui/src/app/user/admin/reducer/collection.reducer.spec.ts +++ b/ui/src/app/user/admin/reducer/collection.reducer.spec.ts @@ -10,22 +10,18 @@ import { Admin } from '../model/admin'; let users = [ { - resourceId: 'abc', - role: 'SUPER_ADMIN', - email: 'foo@bar.com', - name: { - first: 'Jane', - last: 'Doe' - } + username: 'abc', + role: 'ROLE_ADMIN', + emailAddress: 'foo@bar.com', + firstName: 'Jane', + lastName: 'Doe' }, { - resourceId: 'def', - role: 'DELEGATED_ADMIN', - email: 'bar@baz.com', - name: { - first: 'John', - last: 'Doe' - } + username: 'def', + role: 'ROLE_USER', + emailAddress: 'bar@baz.com', + firstName: 'John', + lastName: 'Doe' } ]; diff --git a/ui/src/app/user/admin/service/admin.service.spec.ts b/ui/src/app/user/admin/service/admin.service.spec.ts index 294bc7c3f..c73fab625 100644 --- a/ui/src/app/user/admin/service/admin.service.spec.ts +++ b/ui/src/app/user/admin/service/admin.service.spec.ts @@ -6,22 +6,18 @@ import { Admin } from '../model/admin'; let users = [ { - resourceId: 'abc', - role: 'SUPER_ADMIN', - email: 'foo@bar.com', - name: { - first: 'Jane', - last: 'Doe' - } + username: 'abc', + role: 'ROLE_ADMIN', + emailAddress: 'foo@bar.com', + firstName: 'Jane', + lastName: 'Doe' }, { - resourceId: 'def', - role: 'DELEGATED_ADMIN', - email: 'bar@baz.com', - name: { - first: 'John', - last: 'Doe' - } + username: 'def', + role: 'ROLE_USER', + emailAddress: 'bar@baz.com', + firstName: 'John', + lastName: 'Doe' } ]; @@ -47,7 +43,7 @@ describe('Admin Service', () => { service.query().subscribe(); backend.expectOne((req: HttpRequest) => { - return req.url === '/api/users' + return req.url === '/api/admin/users' && req.method === 'GET'; }, `GET admin collection`); } @@ -59,7 +55,7 @@ describe('Admin Service', () => { service.update({...users[0]}).subscribe(); backend.expectOne((req: HttpRequest) => { - return req.url === '/api/users/abc' + return req.url === '/api/admin/users/abc' && req.method === 'PUT'; }, `PUT admin user`); } @@ -68,10 +64,10 @@ describe('Admin Service', () => { describe('remove method', () => { it(`should send an expected delete request`, async(inject([AdminService, HttpTestingController], (service: AdminService, backend: HttpTestingController) => { - service.remove(users[0].resourceId).subscribe(); + service.remove(users[0].username).subscribe(); backend.expectOne((req: HttpRequest) => { - return req.url === '/api/users/abc' + return req.url === '/api/admin/users/abc' && req.method === 'DELETE'; }, `DELETE admin user`); }