diff --git a/webapp/src/app/geosource/components/dataset-detail/dataset-detail.component.spec.ts b/webapp/src/app/geosource/components/dataset-detail/dataset-detail.component.spec.ts index 1a16ca4c26a59524da30d05e95db28078986a2a8..e79c66b73be40b620034ee32a768c4866d2867ce 100644 --- a/webapp/src/app/geosource/components/dataset-detail/dataset-detail.component.spec.ts +++ b/webapp/src/app/geosource/components/dataset-detail/dataset-detail.component.spec.ts @@ -1,98 +1,25 @@ -import { async, ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing'; -import { DebugElement, Directive, Input, NO_ERRORS_SCHEMA } from '@angular/core'; -import { ActivatedRoute, convertToParamMap, ParamMap } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; -import { DatasetDetailComponent } from './dataset-detail.component'; -import { DatasetService} from '../../services/dataset.service'; -import { Metadata } from '../../models'; -import { RouterTestingModule } from '@angular/router/testing'; -import 'rxjs/add/observable/of'; - -describe('DatasetDetailComponent', () => { - - const metadata = { - title: 'Metadata Title', - abstract: 'abstract', - keyword: ['riri', 'fifi', 'loulou'], - getCategories: function() { return ['space_exploration', 'tintin_sur_la_lune']; }, - } as Metadata; - - describe('ngOnInit()', () => { - - const metadataId = 1; - - let component: DatasetDetailComponent; - let activatedRouteMock: ActivatedRoute; - let datasetServiceMock: DatasetService; - - beforeEach(() => { - activatedRouteMock = { - get paramMap(): Observable<ParamMap> { - return null; - }, - } as ActivatedRoute; - datasetServiceMock = jasmine.createSpyObj('datasetService', { - getMetadataById: Observable.of(metadata), - }); - component = new DatasetDetailComponent(activatedRouteMock, datasetServiceMock); - }); - - it('should get dataset ID in path and get metadata details from service', () => { - // Given - const paramMapSpy = spyOnProperty(activatedRouteMock, 'paramMap', 'get').and - .returnValue(Observable.of(convertToParamMap({ id: metadataId }))); +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - // When - component.ngOnInit(); - - // Then - expect(paramMapSpy).toHaveBeenCalled(); - expect(datasetServiceMock.getMetadataById).toHaveBeenCalledWith(metadataId); - expect(component.metadata).toBe(metadata); - }); +import { DatasetDetailComponent } from './dataset-detail.component'; +describe('DatasetMapComponent', () => { + let component: DatasetDetailComponent; + let fixture: ComponentFixture<DatasetDetailComponent>; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ DatasetDetailComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatasetDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); }); - describe('template', () => { - - let fixture: ComponentFixture<DatasetDetailComponent>; - let comp: DatasetDetailComponent; - let de: DebugElement; - - beforeEach(() => { - TestBed.configureTestingModule({ - declarations: [ - DatasetDetailComponent - ], - imports: [ - RouterTestingModule, - ], - schemas: [ - NO_ERRORS_SCHEMA, - ], - providers: [ - { - provide: DatasetService, - useValue: { - getMetadataById(): Observable<Metadata> { - return Observable.of(metadata); - }, - }, - }, - ], - }).compileComponents(); - }); - - beforeEach(fakeAsync(() => { - fixture = TestBed.createComponent(DatasetDetailComponent); - de = fixture.debugElement; - comp = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create the component', async(() => { - expect(fixture).toBeTruthy(); - })); - + it('should create', () => { + expect(component).toBeTruthy(); }); }); diff --git a/webapp/src/app/geosource/components/dataset-detail/dataset-detail.component.ts b/webapp/src/app/geosource/components/dataset-detail/dataset-detail.component.ts index ab6de63d65e03858decfa072241d5ab1d642fe11..99f3a4e6d9f3359d3d38d3c1ad68681278a35af5 100644 --- a/webapp/src/app/geosource/components/dataset-detail/dataset-detail.component.ts +++ b/webapp/src/app/geosource/components/dataset-detail/dataset-detail.component.ts @@ -14,16 +14,7 @@ export class DatasetDetailComponent implements OnInit { metadata: Metadata; - constructor( - private _route: ActivatedRoute, - private _datasetService: DatasetService - ) {} + constructor() {} - ngOnInit() { - this._route.paramMap - .switchMap((params: ParamMap) => this._datasetService.getMetadataById(params.get('id'))) - .subscribe((metadata: Metadata) => { - this.metadata = metadata; - }); - } + ngOnInit() {} } diff --git a/webapp/src/app/geosource/geosource-routing.module.ts b/webapp/src/app/geosource/geosource-routing.module.ts index a8a01c8727c256a249b359b044b2196cd355fed1..f6b582700a32fe5fd1aa313e84e6ce96480a91a0 100644 --- a/webapp/src/app/geosource/geosource-routing.module.ts +++ b/webapp/src/app/geosource/geosource-routing.module.ts @@ -12,6 +12,10 @@ export const routes: Routes = [ redirectTo: 'datasets', pathMatch: 'full' }, + { + path: 'datasets', + component: DatasetListComponent + }, { path: 'datasets/:id', component: DatasetDetailComponent, @@ -30,11 +34,7 @@ export const routes: Routes = [ component: DatasetMapComponent } ] - }, - { - path: 'datasets', - component: DatasetListComponent - }, + } ] }, ];