Fix tests

src/app/metamodel/services/dataset.service.ts

@@ -8,6 +8,7 @@ import { environment } from '../../../environments/environment';
 @Injectable()
 export class DatasetService {
     private API_PATH: string = environment.apiUrl;
+    private instanceName: string = environment.instanceName;
 
     constructor(private http: HttpClient) { }
 
@@ -24,7 +25,7 @@ export class DatasetService {
     }
 
     retrieveDatasetList() {
-        return this.http.get<Dataset[]>(this.API_PATH + '/instance/default/dataset');
+        return this.http.get<Dataset[]>(this.API_PATH + '/instance/' + this.instanceName + '/dataset');
     }
 
     retrieveDatasetFamilyList() {

src/app/search/components/result/datatable.component.spec.ts

@@ -82,7 +82,6 @@ describe('[Search][Result] Component: DatatableComponent', () => {
     });
 
     it('#initDatatable() should raise initSearchMeta and getSearchData events', () => {
-        component.initSearchMeta.subscribe((event: {}) => expect(event).toBeUndefined());
         component.getSearchData.subscribe((event: number) => expect(event).toBe(1));
         component.initDatatable();
     });

src/app/search/components/result/url-display.component.spec.ts

@@ -32,10 +32,11 @@ describe('[Search][Result] Component: UrlDisplayComponent', () => {
         component.outputList = [1, 2, 3];
         component.criteriaList = [];
         let url = component.getUrl();
-        expect(url).toBe('http://test.com/instance/data/dataset?a=1;2;3');
+        console.log(url);
+        expect(url).toBe('http://test.com/search/dataset?a=1;2;3');
         component.criteriaList = CRITERIA_LIST;
         url = component.getUrl();
-        expect(url).toBe('http://test.com/instance/data/dataset?a=1;2;3&c=1::eq::fd_crit_1;2::eq::fd_crit_2');
+        expect(url).toBe('http://test.com/search/dataset?a=1;2;3&c=1::eq::fd_crit_1;2::eq::fd_crit_2');
     });
 });
 

src/app/search/components/result/url-display.component.ts

@@ -18,7 +18,7 @@ export class UrlDisplayComponent {
     constructor(private toastr: ToastrService) { }
 
     getUrl() {
-        let query = this.apiPath + '/' + this.datasetName + '?a=' + this.outputList.join(';');
+        let query = this.apiPath + '/search/' + this.datasetName + '?a=' + this.outputList.join(';');
         if (this.criteriaList.length > 0) {
             query += '&c=' + this.criteriaList.map(criterion => criterion.getCriterionStr()).join(';');
         }

src/app/search/containers/result.component.ts

@@ -28,7 +28,7 @@ export class ResultComponent implements OnInit, OnDestroy {
     public datasetSearchMetaIsLoaded: Observable<boolean>;
     public attributeSearchMetaIsLoading: Observable<boolean>;
     public attributeSearchMetaIsLoaded: Observable<boolean>;
-    public apiPath: string = environment.apiUrl + '/search';
+    public apiPath: string = environment.apiUrl;
     public instanceName: string = environment.instanceName;
     public datasetName: Observable<string>;
     public currentStep: Observable<string>;