From 87759008eb5f7344d2b2d5c50337987ec485e259 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Wed, 20 Jun 2018 08:14:36 -0700 Subject: [PATCH] SHIBUI-598 --- ui/src/app/core/service/differential.service.ts | 1 - ui/src/app/metadata/domain/service/provider.service.spec.ts | 4 ++-- .../filter/component/search-dialog.component.spec.ts | 2 +- ui/src/app/metadata/manager/container/manager.component.ts | 2 -- ui/src/app/metadata/metadata.component.ts | 2 -- .../resolver/component/wizard-nav.component.spec.ts | 6 +++--- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/ui/src/app/core/service/differential.service.ts b/ui/src/app/core/service/differential.service.ts index b4e432126..f4ecdf0c1 100644 --- a/ui/src/app/core/service/differential.service.ts +++ b/ui/src/app/core/service/differential.service.ts @@ -20,7 +20,6 @@ export class DifferentialService { return lib.updatedDiff(originalObj, updatedObj); } detailedDiff(originalObj, updatedObj) { // returns an object with the added, deleted and updated differences - console.log(originalObj, updatedObj); return lib.detailedDiff(originalObj, updatedObj); } } diff --git a/ui/src/app/metadata/domain/service/provider.service.spec.ts b/ui/src/app/metadata/domain/service/provider.service.spec.ts index 0baba3374..814c413ac 100644 --- a/ui/src/app/metadata/domain/service/provider.service.spec.ts +++ b/ui/src/app/metadata/domain/service/provider.service.spec.ts @@ -4,7 +4,7 @@ import { HttpClientModule, HttpRequest } from '@angular/common/http'; import { MetadataProviderService } from './provider.service'; import { EntityAttributesFilter } from '../entity'; -xdescribe(`Metadata Provider Service`, () => { +describe(`Metadata Provider Service`, () => { beforeEach(() => { TestBed.configureTestingModule({ @@ -24,7 +24,7 @@ xdescribe(`Metadata Provider Service`, () => { service.query().subscribe(); backend.expectOne((req: HttpRequest) => { - return req.url === `${service.base}${service.endpoint}s` + return req.url === `${service.base}${service.endpoint}` && req.method === 'GET'; }, `GET MetadataResolvers collection`); } diff --git a/ui/src/app/metadata/filter/component/search-dialog.component.spec.ts b/ui/src/app/metadata/filter/component/search-dialog.component.spec.ts index 8992df655..82144a232 100644 --- a/ui/src/app/metadata/filter/component/search-dialog.component.spec.ts +++ b/ui/src/app/metadata/filter/component/search-dialog.component.spec.ts @@ -21,7 +21,7 @@ describe('Search Dialog', () => { ReactiveFormsModule, NgbModalModule, StoreModule.forRoot({ - 'metadata-filter': combineReducers(fromFilter.reducers), + 'filter': combineReducers(fromFilter.reducers), }), SharedModule ], diff --git a/ui/src/app/metadata/manager/container/manager.component.ts b/ui/src/app/metadata/manager/container/manager.component.ts index 7b3b5687a..0fe3a8a42 100644 --- a/ui/src/app/metadata/manager/container/manager.component.ts +++ b/ui/src/app/metadata/manager/container/manager.component.ts @@ -51,8 +51,6 @@ export class ManagerComponent implements OnInit { this.total$ = this.resolvers$.pipe(map(list => list.length)); this.limited$ = this.getPagedResolvers(this.page, this.resolvers$); - - this.entitiesOpen$.subscribe(p => console.log(p)); } ngOnInit (): void { diff --git a/ui/src/app/metadata/metadata.component.ts b/ui/src/app/metadata/metadata.component.ts index 66b009e8d..52ca814e2 100644 --- a/ui/src/app/metadata/metadata.component.ts +++ b/ui/src/app/metadata/metadata.component.ts @@ -20,7 +20,5 @@ export class MetadataPageComponent { this.store.dispatch(new LoadResolverRequest()); this.store.dispatch(new LoadFilterRequest()); this.store.dispatch(new LoadDraftRequest()); - - console.log('metadata page component'); } } diff --git a/ui/src/app/metadata/resolver/component/wizard-nav.component.spec.ts b/ui/src/app/metadata/resolver/component/wizard-nav.component.spec.ts index 0a8f01d1f..edca7821c 100644 --- a/ui/src/app/metadata/resolver/component/wizard-nav.component.spec.ts +++ b/ui/src/app/metadata/resolver/component/wizard-nav.component.spec.ts @@ -4,7 +4,7 @@ import { ReactiveFormsModule } from '@angular/forms'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { StoreModule, Store, combineReducers } from '@ngrx/store'; import { WizardNavComponent } from './wizard-nav.component'; -import * as fromEditor from '../reducer'; +import * as fromResolver from '../reducer'; import { ProviderEditorFormModule } from '../../domain/component'; import { DomainModule } from '../../domain/domain.module'; import { SharedModule } from '../../../shared/shared.module'; @@ -36,7 +36,7 @@ class TestHostComponent { describe('Wizard Nav Component', () => { let fixture: ComponentFixture; - let store: Store; + let store: Store; let instance: TestHostComponent; let wizard: WizardNavComponent; @@ -46,7 +46,7 @@ describe('Wizard Nav Component', () => { imports: [ NoopAnimationsModule, StoreModule.forRoot({ - 'edit-provider': combineReducers(fromEditor.reducers), + 'resolver': combineReducers(fromResolver.reducers), }), ReactiveFormsModule, DomainModule,