diff --git a/platform/persistence/elastic/src/ElasticSearchProvider.js b/platform/persistence/elastic/src/ElasticSearchProvider.js index e42cd6553d..5523ebe7bd 100644 --- a/platform/persistence/elastic/src/ElasticSearchProvider.js +++ b/platform/persistence/elastic/src/ElasticSearchProvider.js @@ -31,7 +31,10 @@ define([ ) { "use strict"; - var DEFAULT_MAX_RESULTS = 100; + var DEFAULT_MAX_RESULTS = 100, + ID_PROPERTY = '_id', + SOURCE_PROPERTY = '_source', + SCORE_PROPERTY = '_score'; /** * A search service which searches through domain objects in @@ -133,15 +136,15 @@ define([ var results = response.data.hits.hits, searchResults = results.map(function (result) { return { - id: result['_id'], - model: result['_source'], - score: result['_score'] + id: result[ID_PROPERTY], + model: result[SOURCE_PROPERTY], + score: result[SCORE_PROPERTY] }; }); return { hits: searchResults, - total: response.data.hits.total, + total: response.data.hits.total }; }; diff --git a/platform/search/test/services/GenericSearchProviderSpec.js b/platform/search/test/services/GenericSearchProviderSpec.js index fb3d595345..b958657e01 100644 --- a/platform/search/test/services/GenericSearchProviderSpec.js +++ b/platform/search/test/services/GenericSearchProviderSpec.js @@ -19,7 +19,8 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/*global define,describe,it,expect,beforeEach,jasmine*/ +/*global define,describe,it,expect,beforeEach,jasmine,Promise,spyOn,waitsFor, + runs*/ /** * SearchSpec. Created by shale on 07/31/2015. @@ -126,12 +127,12 @@ define([ }); it('tracks ids to index', function () { - expect(provider.indexedIds['a']).not.toBeDefined(); - expect(provider.pendingIndex['a']).not.toBeDefined(); + expect(provider.indexedIds.a).not.toBeDefined(); + expect(provider.pendingIndex.a).not.toBeDefined(); expect(provider.idsToIndex).not.toContain('a'); provider.scheduleForIndexing('a'); - expect(provider.indexedIds['a']).toBeDefined(); - expect(provider.pendingIndex['a']).toBeDefined(); + expect(provider.indexedIds.a).toBeDefined(); + expect(provider.pendingIndex.a).toBeDefined(); expect(provider.idsToIndex).toContain('a'); }); @@ -214,7 +215,7 @@ define([ provider.beginIndexRequest(); waitsFor(function () { return provider.pendingRequests === 0; - }) + }); runs(function () { expect(provider.index) .toHaveBeenCalledWith('abc', models.abc); @@ -224,7 +225,7 @@ define([ it('does not error if no objects queued', function () { provider.idsToIndex = []; expect(function () { - provider.beginIndexRequest() + provider.beginIndexRequest(); }).not.toThrow(); }); }); diff --git a/platform/search/test/services/SearchAggregatorSpec.js b/platform/search/test/services/SearchAggregatorSpec.js index d63b672b2b..f8bee0dcc0 100644 --- a/platform/search/test/services/SearchAggregatorSpec.js +++ b/platform/search/test/services/SearchAggregatorSpec.js @@ -45,7 +45,7 @@ define([ 'objectService', ['getObjects'] ); - providers = [], + providers = []; aggregator = new SearchAggregator($q, objectService, providers); });