From 8548aef2b035a04a3f25175d8b2f0cca6302b5cb Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Thu, 16 Aug 2018 15:39:31 +0200
Subject: [PATCH] test fixes for browse pages

---
 src/app/core/data/data.service.spec.ts | 30 +++++++++-----------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/app/core/data/data.service.spec.ts b/src/app/core/data/data.service.spec.ts
index 8377afe92e..7af06ff62a 100644
--- a/src/app/core/data/data.service.spec.ts
+++ b/src/app/core/data/data.service.spec.ts
@@ -10,7 +10,7 @@ import { Observable } from 'rxjs/Observable';
 import { FindAllOptions } from './request.models';
 import { SortOptions, SortDirection } from '../cache/models/sort-options.model';
 
-const LINK_NAME = 'test'
+const endpoint = 'https://rest.api/core';
 
 // tslint:disable:max-classes-per-file
 class NormalizedTestObject extends NormalizedObject {
@@ -28,10 +28,9 @@ class TestService extends DataService<NormalizedTestObject, any> {
         super();
     }
 
-    public getScopedEndpoint(scope: string): Observable<string> {
-        throw new Error('getScopedEndpoint is abstract in DataService');
+    public getBrowseEndpoint(options: FindAllOptions): Observable<string> {
+        return Observable.of(endpoint);
     }
-
 }
 
 describe('DataService', () => {
@@ -42,7 +41,6 @@ describe('DataService', () => {
     const halService = {} as HALEndpointService;
     const rdbService = {} as RemoteDataBuildService;
     const store = {} as Store<CoreState>;
-    const endpoint = 'https://rest.api/core';
 
     function initTestService(): TestService {
         return new TestService(
@@ -50,7 +48,7 @@ describe('DataService', () => {
             requestService,
             rdbService,
             store,
-            LINK_NAME,
+            endpoint,
             halService
           );
     }
@@ -62,25 +60,17 @@ describe('DataService', () => {
         it('should return an observable with the endpoint', () => {
             options = {};
 
-            (service as any).getFindAllHref(endpoint).subscribe((value) => {
+            (service as any).getFindAllHref(options).subscribe((value) => {
                     expect(value).toBe(endpoint);
                 }
             );
         });
 
-        // getScopedEndpoint is not implemented in abstract DataService
-        it('should throw error if scopeID provided in options', () => {
-            options = { scopeID: 'somevalue' };
-
-            expect(() => { (service as any).getFindAllHref(endpoint, options) })
-                .toThrowError('getScopedEndpoint is abstract in DataService');
-        });
-
         it('should include page in href if currentPage provided in options', () => {
             options = { currentPage: 2 };
             const expected = `${endpoint}?page=${options.currentPage - 1}`;
 
-            (service as any).getFindAllHref(endpoint, options).subscribe((value) => {
+            (service as any).getFindAllHref(options).subscribe((value) => {
                 expect(value).toBe(expected);
             });
         });
@@ -89,7 +79,7 @@ describe('DataService', () => {
             options = { elementsPerPage: 5 };
             const expected = `${endpoint}?size=${options.elementsPerPage}`;
 
-            (service as any).getFindAllHref(endpoint, options).subscribe((value) => {
+            (service as any).getFindAllHref(options).subscribe((value) => {
                 expect(value).toBe(expected);
             });
         });
@@ -99,7 +89,7 @@ describe('DataService', () => {
             options = { sort:  sortOptions};
             const expected = `${endpoint}?sort=${sortOptions.field},${sortOptions.direction}`;
 
-            (service as any).getFindAllHref(endpoint, options).subscribe((value) => {
+            (service as any).getFindAllHref(options).subscribe((value) => {
                 expect(value).toBe(expected);
             });
         });
@@ -108,7 +98,7 @@ describe('DataService', () => {
             options = { startsWith: 'ab' };
             const expected = `${endpoint}?startsWith=${options.startsWith}`;
 
-            (service as any).getFindAllHref(endpoint, options).subscribe((value) => {
+            (service as any).getFindAllHref(options).subscribe((value) => {
                 expect(value).toBe(expected);
             });
         });
@@ -124,7 +114,7 @@ describe('DataService', () => {
             const expected = `${endpoint}?page=${options.currentPage - 1}&size=${options.elementsPerPage}` +
                 `&sort=${sortOptions.field},${sortOptions.direction}&startsWith=${options.startsWith}`;
 
-            (service as any).getFindAllHref(endpoint, options).subscribe((value) => {
+            (service as any).getFindAllHref(options).subscribe((value) => {
                 expect(value).toBe(expected);
         });
         })