Skip to content

Commit

Permalink
SHIBUI-812 Fixed tests
Browse files Browse the repository at this point in the history
  • Loading branch information
rmathis committed Sep 24, 2018
1 parent e7c339f commit 6b425de
Show file tree
Hide file tree
Showing 12 changed files with 82 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { AttributeReleaseFormComponent } from './attribute-release-form.componen
import { ListValuesService } from '../../../domain/service/list-values.service';
import * as stubs from '../../../../../testing/resolver.stub';
import { MockI18nModule } from '../../../../../testing/i18n.stub';
import { MockListValueService } from '../../../../../testing/list-values.stub';

describe('Attribute Release Form Component', () => {
let fixture: ComponentFixture<AttributeReleaseFormComponent>;
Expand All @@ -19,7 +20,7 @@ describe('Attribute Release Form Component', () => {
ProviderValueEmitter,
ProviderStatusEmitter,
NgbPopoverConfig,
ListValuesService
{ provide: ListValuesService, useClass: MockListValueService }
],
imports: [
NoopAnimationsModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { DescriptorInfoFormComponent } from './descriptor-info-form.component';
import * as stubs from '../../../../../testing/resolver.stub';
import { SharedModule } from '../../../../shared/shared.module';
import { MockI18nModule } from '../../../../../testing/i18n.stub';
import { MockListValueService } from '../../../../../testing/list-values.stub';

@Component({
template: `<descriptor-info-form [resolver]="resolver"></descriptor-info-form>`
Expand Down Expand Up @@ -48,7 +49,7 @@ describe('Descriptor Info Form Component', () => {
ProviderValueEmitter,
ProviderStatusEmitter,
NgbPopoverConfig,
ListValuesService
{ provide: ListValuesService, useClass: MockListValueService }
],
imports: [
NoopAnimationsModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import * as stubs from '../../../../../testing/resolver.stub';
import { FileBackedHttpMetadataResolver } from '../../entity';
import { InputDefaultsDirective } from '../../../../shared/directive/input-defaults.directive';
import { MockI18nModule } from '../../../../../testing/i18n.stub';
import { MockListValueService } from '../../../../../testing/list-values.stub';

@Component({
template: `<finish-form [resolver]="resolver"></finish-form>`
Expand Down Expand Up @@ -42,7 +43,7 @@ describe('Finished Form Component', () => {
ProviderValueEmitter,
ProviderStatusEmitter,
NgbPopoverConfig,
ListValuesService,
{ provide: ListValuesService, useClass: MockListValueService },
{ provide: Router, useClass: RouterStub },
{ provide: ActivatedRoute, useClass: ActivatedRouteStub }
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import * as stubs from '../../../../../testing/resolver.stub';
import { FileBackedHttpMetadataResolver } from '../../entity';
import { InputDefaultsDirective } from '../../../../shared/directive/input-defaults.directive';
import { MockI18nModule } from '../../../../../testing/i18n.stub';
import { MockListValueService } from '../../../../../testing/list-values.stub';

@Component({
template: `<key-info-form [resolver]="resolver"></key-info-form>`
Expand Down Expand Up @@ -43,7 +44,7 @@ describe('Security (Key) Info Form Component', () => {
ProviderValueEmitter,
ProviderStatusEmitter,
NgbPopoverConfig,
ListValuesService
{ provide: ListValuesService, useClass: MockListValueService }
],
imports: [
NoopAnimationsModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import * as stubs from '../../../../../testing/resolver.stub';
import { FileBackedHttpMetadataResolver } from '../../entity';
import { InputDefaultsDirective } from '../../../../shared/directive/input-defaults.directive';
import { MockI18nModule } from '../../../../../testing/i18n.stub';
import { MockListValueService } from '../../../../../testing/list-values.stub';

@Component({
template: `<logout-form [resolver]="resolver"></logout-form>`
Expand Down Expand Up @@ -41,7 +42,7 @@ describe('Logout Endpoints Form Component', () => {
ProviderValueEmitter,
ProviderStatusEmitter,
NgbPopoverConfig,
ListValuesService
{ provide: ListValuesService, useClass: MockListValueService }
],
imports: [
NoopAnimationsModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import * as stubs from '../../../../../testing/resolver.stub';
import { FileBackedHttpMetadataResolver } from '../../entity';
import { InputDefaultsDirective } from '../../../../shared/directive/input-defaults.directive';
import { MockI18nModule } from '../../../../../testing/i18n.stub';
import { MockListValueService } from '../../../../../testing/list-values.stub';

@Component({
template: `<metadata-ui-form [resolver]="resolver"></metadata-ui-form>`
Expand Down Expand Up @@ -39,7 +40,7 @@ describe('Metadata UI Form Component', () => {
ProviderValueEmitter,
ProviderStatusEmitter,
NgbPopoverConfig,
ListValuesService
{ provide: ListValuesService, useClass: MockListValueService }
],
imports: [
NoopAnimationsModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { ListValuesService } from '../../../domain/service/list-values.service';
import { OrganizationInfoFormComponent } from './organization-info-form.component';
import * as stubs from '../../../../../testing/resolver.stub';
import { MockI18nModule } from '../../../../../testing/i18n.stub';
import { MockListValueService } from '../../../../../testing/list-values.stub';

describe('Organization Info Form Component', () => {
let fixture: ComponentFixture<OrganizationInfoFormComponent>;
Expand All @@ -18,7 +19,7 @@ describe('Organization Info Form Component', () => {
ProviderValueEmitter,
ProviderStatusEmitter,
NgbPopoverConfig,
ListValuesService
{ provide: ListValuesService, useClass: MockListValueService }
],
imports: [
NoopAnimationsModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import * as stubs from '../../../../../testing/resolver.stub';
import { SharedModule } from '../../../../shared/shared.module';
import { FileBackedHttpMetadataResolver } from '../../entity';
import { MockI18nModule } from '../../../../../testing/i18n.stub';
import { MockListValueService } from '../../../../../testing/list-values.stub';


@Component({
Expand Down Expand Up @@ -48,7 +49,7 @@ describe('Relying Party Form Component', () => {
ProviderValueEmitter,
ProviderStatusEmitter,
NgbPopoverConfig,
ListValuesService
{ provide: ListValuesService, useClass: MockListValueService }
],
imports: [
NoopAnimationsModule,
Expand Down
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@ import { TestBed, async, inject } from '@angular/core/testing';
import { EntityValidators } from './entity-validators.service';
import { Observable, of } from 'rxjs';
import { ListValuesService } from './list-values.service';
import { AttributesService } from './attributes.service';
import { MockAttributeService } from '../../../../testing/attributes.stub';

describe(`ListValuesService`, () => {
let service: ListValuesService;
beforeEach(() => {
TestBed.configureTestingModule({
imports: [],
providers: [
{ provide: AttributesService, useClass: MockAttributeService },
ListValuesService
]
});
Expand Down
16 changes: 16 additions & 0 deletions ui/src/testing/attributes.stub.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { Observable, of } from 'rxjs';
import { Injectable } from '@angular/core';
import { ReleaseAttribute } from '../app/metadata/domain/model/properties/release-attribute';

@Injectable()
export class MockAttributeService {

readonly path = '/customAttributes';
readonly base = '/api';

constructor() { }

query(path: string = this.path): Observable<ReleaseAttribute[]> {
return of([]);
}
}
47 changes: 47 additions & 0 deletions ui/src/testing/list-values.stub.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { Observable, of } from 'rxjs';
import { Injectable } from '@angular/core';
import { ReleaseAttribute } from '../app/metadata/domain/model/properties/release-attribute';
import { debounceTime, distinctUntilChanged, combineLatest } from 'rxjs/operators';

@Injectable()
export class MockListValueService {

constructor() { }

readonly nameIdFormats: Observable<string[]> = of([
'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified',
'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress',
'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent',
'urn:oasis:names:tc:SAML:2.0:nameid-format:transient'
]);

readonly authenticationMethods: Observable<string[]> = of([
'https://refeds.org/profile/mfa',
'urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken',
'urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport'
]);

get attributesToRelease(): Observable<ReleaseAttribute[]> {
return of([]);
}

searchStringList = (list: Observable<string[]>): Function =>
(text$: Observable<string>) =>
text$.pipe(
debounceTime(100),
distinctUntilChanged(),
combineLatest(
list,
(term, formats) => formats.filter(
v => v.toLowerCase().match(term.toLowerCase())
)
.slice(0, 4))
)

get searchFormats(): Function {
return this.searchStringList(this.nameIdFormats);
}
get searchAuthenticationMethods(): Function {
return this.searchStringList(this.authenticationMethods);
}
}

0 comments on commit 6b425de

Please sign in to comment.