Skip to content

Commit

Permalink
Merged in feature/SHIBUI-1528 (pull request #400)
Browse files Browse the repository at this point in the history
SHIBUI-1528 Updated code w/ tests
  • Loading branch information
rmathis committed Oct 28, 2019
2 parents c9a19fc + e8f6f71 commit 69c8949
Show file tree
Hide file tree
Showing 43 changed files with 939 additions and 143 deletions.
24 changes: 0 additions & 24 deletions ui/src/app/admin/action/admin-collection.action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ import { Update } from '@ngrx/entity';
import { Admin } from '../model/admin';

export enum AdminCollectionActionTypes {
SELECT_ADMIN_REQUEST = '[Admin Collection] Select Admin Request',
SELECT_ADMIN_SUCCESS = '[Admin Collection] Select Admin Success',
SELECT_ADMIN_FAIL = '[Admin Collection] Select Admin Fail',

UPDATE_ADMIN_REQUEST = '[Admin Collection] Update Admin Request',
UPDATE_ADMIN_SUCCESS = '[Admin Collection] Update Admin Success',
Expand All @@ -27,24 +24,6 @@ export enum AdminCollectionActionTypes {

}

export class SelectAdmin implements Action {
readonly type = AdminCollectionActionTypes.SELECT_ADMIN_REQUEST;

constructor(public payload: string) { }
}

export class SelectAdminSuccess implements Action {
readonly type = AdminCollectionActionTypes.SELECT_ADMIN_SUCCESS;

constructor(public payload: Admin) { }
}

export class SelectAdminFail implements Action {
readonly type = AdminCollectionActionTypes.SELECT_ADMIN_FAIL;

constructor(public payload: Error) { }
}

export class LoadAdminRequest implements Action {
readonly type = AdminCollectionActionTypes.LOAD_ADMIN_REQUEST;

Expand Down Expand Up @@ -132,9 +111,6 @@ export type AdminCollectionActionsUnion =
| RemoveAdminRequest
| RemoveAdminSuccess
| RemoveAdminFail
| SelectAdmin
| SelectAdminSuccess
| SelectAdminFail
| UpdateAdminRequest
| UpdateAdminSuccess
| UpdateAdminFail
Expand Down
65 changes: 65 additions & 0 deletions ui/src/app/admin/component/access-request.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import { Component, ViewChild } from '@angular/core';
import { TestBed, async, ComponentFixture } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { Store, StoreModule, combineReducers } from '@ngrx/store';
import { FormsModule } from '@angular/forms';

import { NgbModalStub } from '../../../testing/modal.stub';
import { AccessRequestComponent } from './access-request.component';
import * as fromAdmin from '../reducer';
import * as fromCore from '../../core/reducer';

@Component({
template: `
<access-request-component></access-request-component>
`
})
class TestHostComponent {
@ViewChild(AccessRequestComponent, { static: true })
public componentUnderTest: AccessRequestComponent;
}

describe('Access Request Component', () => {

let app: AccessRequestComponent;
let fixture: ComponentFixture<TestHostComponent>;
let instance: TestHostComponent;
let store: Store<fromAdmin.State>;

beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
FormsModule,
NgbDropdownModule,
RouterTestingModule,
StoreModule.forRoot({
admin: combineReducers(fromAdmin.reducers),
core: combineReducers(fromCore.reducers)
})
],
declarations: [
AccessRequestComponent,
TestHostComponent
],
providers: [
{
provide: NgbModal,
useClass: NgbModalStub
}
]
}).compileComponents();

store = TestBed.get(Store);
spyOn(store, 'dispatch');

fixture = TestBed.createComponent(TestHostComponent);
instance = fixture.componentInstance;
app = instance.componentUnderTest;
fixture.detectChanges();
}));

it('should compile without error', async(() => {
expect(app).toBeTruthy();
}));
});
55 changes: 55 additions & 0 deletions ui/src/app/admin/component/delete-user-dialog.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import { Component, ViewChild } from '@angular/core';
import { TestBed, async, ComponentFixture } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';

import { NgbDropdownModule, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';

import { DeleteUserDialogComponent } from './delete-user-dialog.component';

@Component({
template: `
<delete-user-dialog></delete-user-dialog>
`
})
class TestHostComponent {
@ViewChild(DeleteUserDialogComponent, { static: true })
public componentUnderTest: DeleteUserDialogComponent;
}

describe('Delete Dialog (modal) Component', () => {

let app: DeleteUserDialogComponent;
let fixture: ComponentFixture<TestHostComponent>;
let instance: TestHostComponent;

beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
NgbDropdownModule,
RouterTestingModule
],
declarations: [
DeleteUserDialogComponent,
TestHostComponent
],
providers: [
{
provide: NgbActiveModal,
useValue: jasmine.createSpyObj('activeModal', [
'close',
'dismiss'
])
}
]
}).compileComponents();

fixture = TestBed.createComponent(TestHostComponent);
instance = fixture.componentInstance;
app = instance.componentUnderTest;
fixture.detectChanges();
}));

it('should compile without error', async(() => {
expect(app).toBeTruthy();
}));
});
17 changes: 0 additions & 17 deletions ui/src/app/admin/component/enable-metadata.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,3 @@
[entities]="resolvers$ | async"
(delete)="deleteResolver($event)"
(toggleEnabled)="toggleResolverEnabled($event)"></resolvers-list>

<!--<ul class="list-unstyled m-0">
<li *ngFor="let resolver of resolvers$ | async; index as i"
[ngClass]="{'mt-2': i > 0}"
aria-label="Provider Item Accordion. Press Spacebar to open">
<resolver-item
[entity]="resolver"
[isOpen]="true"
(select)="edit(resolver)"
(preview)="openPreviewDialog(resolver)"
(delete)="deleteResolver(resolver)"
(toggleEnabled)="toggleResolverEnabled(resolver, !resolver.enabled)"
[showAdminFunctions]="true"
[allowDelete]="true">
</resolver-item>
</li>
</ul>-->
65 changes: 65 additions & 0 deletions ui/src/app/admin/component/enable-metadata.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import { Component, ViewChild } from '@angular/core';
import { TestBed, async, ComponentFixture } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';

import { NgbDropdownModule, NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap';

import { EnableMetadataComponent } from './enable-metadata.component';

import * as fromAdmin from '../reducer';
import { Store, StoreModule, combineReducers } from '@ngrx/store';
import { NgbModalStub } from '../../../testing/modal.stub';
import { MockResolversListComponent } from '../../../testing/resolvers-list.component.stub';

@Component({
template: `
<enable-metadata></enable-metadata>
`
})
class TestHostComponent {
@ViewChild(EnableMetadataComponent, { static: true })
public componentUnderTest: EnableMetadataComponent;
}

describe('Enable Metadata (modal) Component', () => {

let app: EnableMetadataComponent;
let fixture: ComponentFixture<TestHostComponent>;
let instance: TestHostComponent;
let store: Store<fromAdmin.State>;

beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
NgbDropdownModule,
RouterTestingModule,
StoreModule.forRoot({
admin: combineReducers(fromAdmin.reducers)
})
],
declarations: [
EnableMetadataComponent,
TestHostComponent,
MockResolversListComponent
],
providers: [
{
provide: NgbModal,
useClass: NgbModalStub
}
]
}).compileComponents();

store = TestBed.get(Store);
spyOn(store, 'dispatch');

fixture = TestBed.createComponent(TestHostComponent);
instance = fixture.componentInstance;
app = instance.componentUnderTest;
fixture.detectChanges();
}));

it('should compile without error', async(() => {
expect(app).toBeTruthy();
}));
});
64 changes: 64 additions & 0 deletions ui/src/app/admin/component/user-management.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import { Component, ViewChild } from '@angular/core';
import { TestBed, async, ComponentFixture } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { Store, StoreModule, combineReducers } from '@ngrx/store';
import { NgbDropdownModule, NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { FormsModule } from '@angular/forms';
import { UserManagementComponent } from './user-management.component';
import { NgbModalStub } from '../../../testing/modal.stub';
import * as fromAdmin from '../reducer';
import * as fromCore from '../../core/reducer';

@Component({
template: `
<user-management></user-management>
`
})
class TestHostComponent {
@ViewChild(UserManagementComponent, { static: true })
public componentUnderTest: UserManagementComponent;
}

describe('User Management Component', () => {

let app: UserManagementComponent;
let fixture: ComponentFixture<TestHostComponent>;
let instance: TestHostComponent;
let store: Store<fromAdmin.State>;

beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
FormsModule,
NgbDropdownModule,
RouterTestingModule,
StoreModule.forRoot({
admin: combineReducers(fromAdmin.reducers),
core: combineReducers(fromCore.reducers)
})
],
declarations: [
UserManagementComponent,
TestHostComponent
],
providers: [
{
provide: NgbModal,
useClass: NgbModalStub
}
]
}).compileComponents();

store = TestBed.get(Store);
spyOn(store, 'dispatch');

fixture = TestBed.createComponent(TestHostComponent);
instance = fixture.componentInstance;
app = instance.componentUnderTest;
fixture.detectChanges();
}));

it('should compile without error', async(() => {
expect(app).toBeTruthy();
}));
});
Loading

0 comments on commit 69c8949

Please sign in to comment.