diff --git a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts index a7e0dd900..0469b62ca 100644 --- a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts +++ b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts @@ -127,7 +127,7 @@ describe('Dashboard Resolvers List Page', () => { it('should route to the wizard page', () => { spyOn(router, 'navigate'); instance.edit(draft); - expect(router.navigate).toHaveBeenCalledWith(['metadata', 'resolver', 'new', 'blank', 'org-info'], { + expect(router.navigate).toHaveBeenCalledWith(['metadata', 'resolver', 'new', 'blank', 'common'], { queryParams: { id: '1' } }); }); diff --git a/ui/src/app/metadata/resolver/container/new-resolver.component.spec.ts b/ui/src/app/metadata/resolver/container/new-resolver.component.spec.ts index bf0f91506..ca735a319 100644 --- a/ui/src/app/metadata/resolver/container/new-resolver.component.spec.ts +++ b/ui/src/app/metadata/resolver/container/new-resolver.component.spec.ts @@ -23,6 +23,7 @@ describe('New Resolver Page', () => { let instance: NewResolverComponent; let activatedRoute: ActivatedRouteStub = new ActivatedRouteStub(); activatedRoute.testParamMap = { id: 'foo', events: of({}) }; + activatedRoute.data = of('foo'); beforeEach(() => { TestBed.configureTestingModule({ diff --git a/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts b/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts index fdd16fd5f..877a7298c 100644 --- a/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts +++ b/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts @@ -2,24 +2,22 @@ import { Component, ViewChild } from '@angular/core'; import { TestBed, async, ComponentFixture } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { StoreModule, Store, combineReducers } from '@ngrx/store'; - -import { NgbDropdownModule, NgbPopoverModule, NgbModal, NgbModalModule } from '@ng-bootstrap/ng-bootstrap'; +import { RouterStateSnapshot } from '@angular/router'; +import { NgbDropdownModule, NgbPopoverModule, NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { of } from 'rxjs'; import { ResolverWizardComponent } from './resolver-wizard.component'; import * as fromRoot from '../reducer'; -import { WizardModule } from '../../../wizard/wizard.module'; -import { WizardSummaryComponent } from '../../domain/component/wizard-summary.component'; -import { SummaryPropertyComponent } from '../../domain/component/summary-property.component'; import * as fromWizard from '../../../wizard/reducer'; import { MockI18nModule } from '../../../../testing/i18n.stub'; import { METADATA_SOURCE_WIZARD } from '../wizard-definition'; import { MetadataSourceWizard } from '../../domain/model/wizards/metadata-source-wizard'; import { initialState } from '../reducer/entity.reducer'; import { MockWizardModule } from '../../../../testing/wizard.stub'; -import { RouterStateSnapshot, ActivatedRouteSnapshot } from '@angular/router'; + import { NgbModalStub } from '../../../../testing/modal.stub'; -import { of } from 'rxjs'; import { MetadataResolver } from '../../domain/model'; +import { DifferentialService } from '../../../core/service/differential.service'; @Component({ template: ` @@ -94,6 +92,7 @@ describe('Resolver Wizard Component', () => { TestHostComponent ], providers: [ + DifferentialService, { provide: NgbModal, useClass: NgbModalStub }, { provide: METADATA_SOURCE_WIZARD, useValue: MetadataSourceWizard } ] diff --git a/ui/src/testing/activated-route.stub.ts b/ui/src/testing/activated-route.stub.ts index 0620096d5..062493069 100644 --- a/ui/src/testing/activated-route.stub.ts +++ b/ui/src/testing/activated-route.stub.ts @@ -3,6 +3,7 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { convertToParamMap, ParamMap, ActivatedRoute } from '@angular/router'; +import { Observable, of } from 'rxjs'; @Injectable() export class ActivatedRouteStub { @@ -16,6 +17,8 @@ export class ActivatedRouteStub { private _firstChild: ActivatedRouteStub; + private _data: Observable; + get testParamMap() { return this._testParamMap; } set testParamMap(params: {}) { this._testParamMap = convertToParamMap(params); @@ -44,4 +47,12 @@ export class ActivatedRouteStub { set firstChild(stub: ActivatedRouteStub) { this._firstChild = stub; } + + get data(): Observable { + return this._data; + } + + set data(d: Observable) { + this._data = d; + } }