Merge master (v1.15.1) into develop (#1794)

Merge master (v1.15.1) into develop

.github/run_browserstack_acceptance.sh

@@ -6,12 +6,4 @@ export BROWSERSTACK_BUILD_ID="${GITHUB_REF_NAME} - ${GITHUB_RUN_ID}"
 COMMIT_MSG_TITLE=$(git log -n 1 --pretty=format:%s)
 export BROWSERSTACK_TEST_RUN_NAME=$COMMIT_MSG_TITLE
 
-if [[ $GITHUB_REF_NAME == release/*
-  || $GITHUB_REF_NAME == hotfix/*
-  || $GITHUB_REF_NAME == master
-  || $GITHUB_REF_NAME == support/* ]]
-then
-  npx testcafe "browserstack:ie@11.0,browserstack:safari" --config-file ./.github/testcafe.json -q
-else
-  npx testcafe -c 2 "browserstack:ie@11.0" --config-file ./.github/testcafe.json -q
-fi
+npx testcafe "browserstack:safari" --config-file ./.github/testcafe.json -q successThreshold=1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yext/answers-search-ui",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "description": "Javascript Search Programming Interface",
   "main": "dist/answers-umd.js",
   "repository": {

tests/acceptance/acceptancesuites/facetsonload.js

@@ -4,8 +4,7 @@ import { RequestLogger } from 'testcafe';
 import {
   browserBackButton,
   browserRefreshPage,
-  browserForwardButton,
-  registerIE11NoCacheHook
+  browserForwardButton
 } from '../utils';
 import { getMostRecentQueryParamsFromLogger } from '../requestUtils';
 import { MockedVerticalSearchRequest } from '../fixtures/responses/vertical/search';
@@ -23,7 +22,6 @@ test('Facets work with back/forward navigation and page refresh', async t => {
     url: VERTICAL_SEARCH_URL_REGEX
   });
   await t.addRequestHooks(logger);
-  await registerIE11NoCacheHook(t, VERTICAL_SEARCH_URL_REGEX);
 
   async function getFacetsFromRequest () {
     const urlParams = await getMostRecentQueryParamsFromLogger(logger);

tests/acceptance/acceptancesuites/facetssuite.js

@@ -1,12 +1,6 @@
-import {
-  FACETS_PAGE,
-  VERTICAL_SEARCH_URL_REGEX
-} from '../constants';
+import { FACETS_PAGE } from '../constants';
 import FacetsPage from '../pageobjects/facetspage';
 import { MockedVerticalSearchRequest } from '../fixtures/responses/vertical/search';
-import {
-  registerIE11NoCacheHook
-} from '../utils';
 import SearchRequestLogger from '../searchrequestlogger';
 import { MockedVerticalAutoCompleteRequest } from '../fixtures/responses/vertical/autocomplete';
 
@@ -16,9 +10,6 @@ fixture`Facets page`
     MockedVerticalSearchRequest,
     MockedVerticalAutoCompleteRequest
   )
-  .beforeEach(async t => {
-    await registerIE11NoCacheHook(t, VERTICAL_SEARCH_URL_REGEX);
-  })
   .page`${FACETS_PAGE}`;
 
 test('can select and reset a single facet', async t => {

tests/acceptance/acceptancesuites/filterboxsuite.js

@@ -4,8 +4,7 @@ import { Selector, RequestLogger } from 'testcafe';
 import {
   browserBackButton,
   browserRefreshPage,
-  browserForwardButton,
-  registerIE11NoCacheHook
+  browserForwardButton
 } from '../utils';
 import {
   getRequestFilters,
@@ -22,17 +21,13 @@ fixture`FilterBox page`
     MockedVerticalSearchRequest,
     MockedVerticalAutoCompleteRequest
   )
-  .beforeEach(async t => {
-    await registerIE11NoCacheHook(t, VERTICAL_SEARCH_URL_REGEX);
-  })
   .page`${FILTERBOX_PAGE}`;
 
 test('single option filterbox works with back/forward navigation and page refresh', async t => {
   const radiusFilterLogger = RequestLogger({
     url: VERTICAL_SEARCH_URL_REGEX
   });
   await t.addRequestHooks(radiusFilterLogger);
-  await registerIE11NoCacheHook(t, VERTICAL_SEARCH_URL_REGEX);
   const searchComponent = FacetsPage.getSearchComponent();
   await searchComponent.enterQuery('all');
   await searchComponent.submitQuery();
@@ -75,7 +70,6 @@ test('multioption filterbox works with back/forward navigation and page refresh'
     url: VERTICAL_SEARCH_URL_REGEX
   });
   await t.addRequestHooks(filterBoxLogger);
-  await registerIE11NoCacheHook(t, VERTICAL_SEARCH_URL_REGEX);
   const martyFilter = {
     c_puppyPreference: {
       $eq: 'Marty'

tests/acceptance/acceptancesuites/filtersearchsuite.js

@@ -1,11 +1,10 @@
-import { FACETS_PAGE, VERTICAL_SEARCH_URL_REGEX } from '../constants';
+import { FACETS_PAGE } from '../constants';
 import FacetsPage from '../pageobjects/facetspage';
 import { Selector } from 'testcafe';
 import {
   browserBackButton,
   browserRefreshPage,
-  browserForwardButton,
-  registerIE11NoCacheHook
+  browserForwardButton
 } from '../utils';
 import { MockedFilterSearchRequest } from '../fixtures/responses/filtersearch/search';
 import { MockedVerticalSearchRequest } from '../fixtures/responses/vertical/search';
@@ -19,9 +18,6 @@ fixture`FilterSearch suite`
     MockedVerticalSearchRequest,
     MockedVerticalAutoCompleteRequest
   )
-  .beforeEach(async t => {
-    await registerIE11NoCacheHook(t, VERTICAL_SEARCH_URL_REGEX);
-  })
   .page`${FACETS_PAGE}`;
 
 test('filtersearch works with back/forward navigation and page refresh', async t => {

tests/acceptance/acceptancesuites/sortoptionssuite.js

@@ -1,14 +1,8 @@
-import {
-  FACETS_PAGE,
-  VERTICAL_SEARCH_URL_REGEX
-} from '../constants';
+import { FACETS_PAGE } from '../constants';
 import FacetsPage from '../pageobjects/facetspage';
 import { MockedVerticalSearchRequest } from '../fixtures/responses/vertical/search';
 import { Selector } from 'testcafe';
-import {
-  browserRefreshPage,
-  registerIE11NoCacheHook
-} from '../utils';
+import { browserRefreshPage } from '../utils';
 import SearchRequestLogger from '../searchrequestlogger';
 import { MockedVerticalAutoCompleteRequest } from '../fixtures/responses/vertical/autocomplete';
 
@@ -17,9 +11,6 @@ fixture`SortOptions suite`
     MockedVerticalSearchRequest,
     MockedVerticalAutoCompleteRequest
   )
-  .beforeEach(async t => {
-    await registerIE11NoCacheHook(t, VERTICAL_SEARCH_URL_REGEX);
-  })
   .page`${FACETS_PAGE}`;
 
 test('selecting a sort option and refreshing maintains that sort selection', async t => {

tests/acceptance/acceptancesuites/universalsuite.js

@@ -1,13 +1,7 @@
 import UniversalPage from '../pageobjects/universalpage';
-import {
-  UNIVERSAL_PAGE,
-  UNIVERSAL_SEARCH_URL_REGEX
-} from '../constants';
+import { UNIVERSAL_PAGE } from '../constants';
 import { MockedUniversalAutoCompleteRequest } from '../fixtures/responses/universal/autocomplete';
 import { MockedUniversalSearchRequest } from '../fixtures/responses/universal/search';
-import {
-  registerIE11NoCacheHook
-} from '../utils';
 import SearchRequestLogger from '../searchrequestlogger';
 
 /**
@@ -23,9 +17,6 @@ fixture`Universal search page works as expected`
     MockedUniversalSearchRequest,
     MockedUniversalAutoCompleteRequest
   )
-  .beforeEach(async t => {
-    await registerIE11NoCacheHook(t, UNIVERSAL_SEARCH_URL_REGEX);
-  })
   .page`${UNIVERSAL_PAGE}`;
 
 test('Basic universal flow', async t => {

tests/acceptance/acceptancesuites/verticalsuite.js

@@ -7,8 +7,7 @@ import { MockedVerticalSearchRequest } from '../fixtures/responses/vertical/sear
 import { RequestLogger } from 'testcafe';
 import {
   browserBackButton,
-  browserRefreshPage,
-  registerIE11NoCacheHook
+  browserRefreshPage
 } from '../utils';
 import SearchRequestLogger from '../searchrequestlogger';
 import { MockedVerticalAutoCompleteRequest } from '../fixtures/responses/vertical/autocomplete';
@@ -19,9 +18,6 @@ fixture`Vertical search page works as expected`
     MockedVerticalSearchRequest,
     MockedVerticalAutoCompleteRequest
   )
-  .beforeEach(async t => {
-    await registerIE11NoCacheHook(t, VERTICAL_SEARCH_URL_REGEX);
-  })
   .page`${VERTICAL_PAGE}`;
 
 test('pagination flow', async t => {
@@ -70,7 +66,6 @@ test('spell check flow', async t => {
     url: VERTICAL_SEARCH_URL_REGEX
   });
   await t.addRequestHooks(spellCheckLogger);
-  await registerIE11NoCacheHook(t, VERTICAL_SEARCH_URL_REGEX);
   const searchComponent = VerticalPage.getSearchComponent();
   await searchComponent.enterQuery('varginia');
   await searchComponent.submitQuery();

tests/acceptance/utils.js

@@ -1,5 +1,4 @@
 import { ClientFunction, Selector } from 'testcafe';
-import IE11NoCacheHook from './ie11nocachehook';
 
 /* global location */
 
@@ -23,22 +22,6 @@ export async function getCurrentUrlParams () {
   return new URLSearchParams(urlParams);
 }
 
-/**
- * Register the Ie11NoCacheHook, if the current browser is IE11.
- *
- * @param {import('testcafe').TestController} testInstance
- * @param {string} url
- */
-export async function registerIE11NoCacheHook (testInstance, url) {
-  const isIE11 = await ClientFunction(() => {
-    return !!window.MSInputMethodContext && !!document.documentMode;
-  })();
-  if (isIE11) {
-    const ie11Hook = new IE11NoCacheHook(url);
-    return testInstance.addRequestHooks(ie11Hook);
-  }
-}
-
 export async function waitForResults () {
   const resultsSelector = await Selector('.yxt-Results');
   await resultsSelector.with({ visibilityCheck: true })();