Lint fixes, adjust implementation and add tests

Constructor-io · Dec 19, 2023 · f25457a · f25457a
1 parent 9b78a88
commit f25457a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/spec/src/modules/autocomplete.js b/spec/src/modules/autocomplete.js
@@ -407,8 +407,6 @@ describe('ConstructorIO - Autocomplete', () => {
       });
 
       autocomplete.getAutocompleteResults('  ').then((res) => {
-        const requestedUrlParams = helpers.extractUrlParamsFromFetch(fetchSpy);
-
         expect(res).to.have.property('request').to.be.an('object');
         expect(res).to.have.property('sections').to.be.an('object');
         expect(res).to.have.property('result_id').to.be.an('string');
@@ -497,8 +495,6 @@ describe('ConstructorIO - Autocomplete', () => {
       });
 
       autocomplete.getAutocompleteResults(queryWithSpaces).then((res) => {
-        const requestedUrlParams = helpers.extractUrlParamsFromFetch(fetchSpy);
-
         expect(res.request.term).to.equal(queryWithSpaces);
         expect(res).to.have.property('request').to.be.an('object');
         expect(res).to.have.property('sections').to.be.an('object');
@@ -627,6 +623,12 @@ describe('ConstructorIO - Autocomplete', () => {
       return expect(autocomplete.getAutocompleteResults(null)).to.eventually.be.rejected;
     });
 
+    it('Should be rejected when query consisting of only non-breaking spaces is provided', () => {
+      const { autocomplete } = new ConstructorIO(validOptions);
+
+      return expect(autocomplete.getAutocompleteResults('  ')).to.eventually.be.rejected;
+    });
+
     it('Should be rejected when invalid numResults parameter is provided', () => {
       const { autocomplete } = new ConstructorIO(validOptions);
 

diff --git a/spec/src/modules/search.js b/spec/src/modules/search.js
@@ -572,8 +572,6 @@ describe('ConstructorIO - Search', () => {
       });
 
       search.getSearchResults(queryWithSpaces).then((res) => {
-        const requestedUrlParams = helpers.extractUrlParamsFromFetch(fetchSpy);
-
         expect(res.request.term).to.equal(utilsHelpers.trimNonBreakingSpaces(queryWithSpaces));
         expect(res).to.have.property('request').to.be.an('object');
         expect(res).to.have.property('response').to.be.an('object');

diff --git a/src/modules/autocomplete.js b/src/modules/autocomplete.js
@@ -23,8 +23,11 @@ function createAutocompleteUrl(query, parameters, userParameters, options) {
   queryParams.i = clientId;
   queryParams.s = sessionId;
 
-  // Validate query (term) is provided
-  if (!query || typeof query !== 'string') {
+  // Trim non breaking spaces from query
+  const queryTrimmed = helpers.trimNonBreakingSpaces(query);
+
+  // Validate query (term) is provided and consists of more than non-breaking spaces
+  if (!queryTrimmed || typeof queryTrimmed !== 'string') {
     throw new Error('query is a required parameter of type string');
   }
 
@@ -112,6 +115,7 @@ function createAutocompleteUrl(query, parameters, userParameters, options) {
   const queryString = qs.stringify(queryParams, { indices: false });
   const cleanedQuery = query.replace(/^\//, '|'); // For compatibility with backend API
 
+  // Note: it is intentional that query is dispatched without being trimmed (`queryTrimmed`)
   return `${serviceUrl}/autocomplete/${helpers.encodeURIComponentRFC3986(cleanedQuery)}?${queryString}`;
 }
 

diff --git a/src/modules/search.js b/src/modules/search.js
@@ -26,10 +26,10 @@ function createSearchUrl(query, parameters, userParameters, options, isVoiceSear
   queryParams.s = sessionId;
 
   // Trim non breaking spaces from query
-  query = helpers.trimNonBreakingSpaces(query);
+  const queryTrimmed = helpers.trimNonBreakingSpaces(query);
 
-  // Validate query (term) is provided
-  if (!query || typeof query !== 'string') {
+  // Validate query (term) is provided and consists of more than non-breaking spaces
+  if (!queryTrimmed || typeof queryTrimmed !== 'string') {
     throw new Error('query is a required parameter of type string');
   }
 
@@ -148,7 +148,7 @@ function createSearchUrl(query, parameters, userParameters, options, isVoiceSear
 
   const searchUrl = isVoiceSearch ? 'search/natural_language' : 'search';
 
-  return `${serviceUrl}/${searchUrl}/${helpers.encodeURIComponentRFC3986(query)}?${queryString}`;
+  return `${serviceUrl}/${searchUrl}/${helpers.encodeURIComponentRFC3986(queryTrimmed)}?${queryString}`;
 }
 
 /**