From d071250e2414b19b363dc922654d211c8d4d63f3 Mon Sep 17 00:00:00 2001 From: suzanadirla Date: Fri, 26 Jan 2018 12:25:55 +0200 Subject: [PATCH] [ADF-2221] Search fails on Content Node Selector (#2888) --- .../content-node-selector-panel.component.spec.ts | 8 ++++---- .../content-node-selector.service.spec.ts | 2 +- .../content-node-selector.service.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/content-services/content-node-selector/content-node-selector-panel.component.spec.ts b/lib/content-services/content-node-selector/content-node-selector-panel.component.spec.ts index 29514fb9e7..ea412d8c9b 100644 --- a/lib/content-services/content-node-selector/content-node-selector-panel.component.spec.ts +++ b/lib/content-services/content-node-selector/content-node-selector-panel.component.spec.ts @@ -124,7 +124,7 @@ describe('ContentNodeSelectorComponent', () => { component.debounceSearch = 0; searchService = TestBed.get(SearchService); - searchSpy = spyOn(searchService, 'search').and.callFake(() => { + searchSpy = spyOn(searchService, 'searchByQueryBody').and.callFake(() => { return Observable.create((observer: Observer) => { _observer = observer; }); @@ -301,7 +301,7 @@ describe('ContentNodeSelectorComponent', () => { typeToSearchBox('kakarot'); setTimeout(() => { - expect(searchSpy).toHaveBeenCalledWith(defaultSearchOptions('kakarot'), '25', '0'); + expect(searchSpy).toHaveBeenCalledWith(defaultSearchOptions('kakarot')); done(); }, 300); }); @@ -325,7 +325,7 @@ describe('ContentNodeSelectorComponent', () => { component.siteChanged( { entry: { guid: 'namek' } }); expect(searchSpy.calls.count()).toBe(2, 'Search count should be two after the site change'); - expect(searchSpy.calls.argsFor(1)).toEqual([defaultSearchOptions('vegeta', 'namek'), '25', '0'] ); + expect(searchSpy.calls.argsFor(1)).toEqual([defaultSearchOptions('vegeta', 'namek')] ); done(); }, 300); }); @@ -523,7 +523,7 @@ describe('ContentNodeSelectorComponent', () => { component.getNextPageOfSearch({ skipCount }); - expect(searchSpy).toHaveBeenCalledWith(defaultSearchOptions('kakarot', undefined, skipCount), '25', skipCount.toString()); + expect(searchSpy).toHaveBeenCalledWith(defaultSearchOptions('kakarot', undefined, skipCount)); }); it('should be shown when pagination\'s hasMoreItems is true', () => { diff --git a/lib/content-services/content-node-selector/content-node-selector.service.spec.ts b/lib/content-services/content-node-selector/content-node-selector.service.spec.ts index 4b81c92b3c..9669449206 100644 --- a/lib/content-services/content-node-selector/content-node-selector.service.spec.ts +++ b/lib/content-services/content-node-selector/content-node-selector.service.spec.ts @@ -22,7 +22,7 @@ import { ContentNodeSelectorService } from './content-node-selector.service'; class SearchServiceMock { public query: QueryBody; - search(query: QueryBody) { + searchByQueryBody(query: QueryBody) { this.query = query; } } diff --git a/lib/content-services/content-node-selector/content-node-selector.service.ts b/lib/content-services/content-node-selector/content-node-selector.service.ts index 2c5ad8e19b..d743fbc5f7 100644 --- a/lib/content-services/content-node-selector/content-node-selector.service.ts +++ b/lib/content-services/content-node-selector/content-node-selector.service.ts @@ -59,6 +59,6 @@ export class ContentNodeSelectorService { } }; - return this.searchService.search(defaultSearchNode, maxItems.toString(), skipCount.toString()); + return this.searchService.searchByQueryBody(defaultSearchNode); } }