Merge in v1.29.5

.github/workflows/acceptance_browserstack.yml

@@ -37,19 +37,3 @@ jobs:
       - run: npm run build-test-site
       - name: Run Acceptance Tests
         run: ./.github/run_browserstack_acceptance.sh browserstack:firefox
-  browserstack-ie11-acceptance-tests:
-    name: IE11 Acceptance Tests (Browserstack)
-    runs-on: ubuntu-latest
-    env:
-      BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
-      BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 14
-      - run: npm ci
-      - run: npm run setup-test-site
-      - run: npm run build-test-site
-      - name: Run Acceptance Tests
-        run: ./.github/run_browserstack_acceptance.sh browserstack:ie@11.0 3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "answers-hitchhiker-theme",
-  "version": "1.29.4",
+  "version": "1.30.0",
   "description": "A starter Search theme for hitchhikers",
   "keywords": [
     "jambo",

static/js/iframe-common.js

@@ -80,11 +80,7 @@ export function generateIFrame(domain, answersExperienceFrame) {
     // For Safari
     document.body.scrollTop = 0;
   });
-
-  window.onpopstate = function() {
-    iframe.contentWindow.location.replace(calcFrameSrc());
-  };
-
+  registerPopStateListener();
   containerEl.appendChild(iframe);
 
   // Notify iframe of a click event on parent window
@@ -135,6 +131,26 @@ export function generateIFrame(domain, answersExperienceFrame) {
   }, '#answers-frame');
 }
 
+function registerPopStateListener() {
+  let previousLocationHref = window.location.href;
+
+  /**
+   * Reloads the iframe with a recalculated src URL.
+   * Does not reload the iframe if the URL has only changed its hash param. 
+   */
+  function popStateListener() {
+    /** @param {string} url  */
+    function getURLWithoutHash(url) {
+      return url.split('#')[0];
+    }
+    if (getURLWithoutHash(previousLocationHref) !== getURLWithoutHash(window.location.href)) {
+      iframe.contentWindow.location.replace(calcFrameSrc());
+    }
+    previousLocationHref = window.location.href;
+  }
+  window.addEventListener('popstate', popStateListener);
+}
+
 /**
  * Sends data to the answers iframe if possible. Otherwise the message is queued
  * so that it can be sent when the iframe initializes.

static/package.json

@@ -1,6 +1,6 @@
 {
   "name": "answers-hitchhiker-theme",
-  "version": "1.29.4",
+  "version": "1.30.0",
   "description": "Toolchain for use with the HH Theme",
   "main": "Gruntfile.js",
   "scripts": {

test-site/.gitignore

@@ -13,6 +13,8 @@ webpack-config.js
 !config/global_config.json
 !config/locale_config.json
 !config/index.json
+!config/index.ar.json
+!config/index.es.json
 !pages/index.html.hbs
 !public/iframe_test.html
 !public/overlay.html

tests/acceptance/suites/client-sdk-http-header.js

@@ -1,12 +1,5 @@
-import {
-  PORT,
-  UNIVERSAL_AUTOCOMPLETE_URL_REGEX,
-  UNIVERSAL_SEARCH_URL_REGEX,
-  VERTICAL_SEARCH_URL_REGEX,
-  VERTICAL_AUTOCOMPLETE_URL_REGEX
-} from '../constants';
+import { PORT } from '../constants';
 import { SearchRequestLogger } from '../searchrequestlogger';
-import { registerIE11NoCacheHook } from '../../test-utils/testcafe';
 import packageJson from '../../../package.json';
 
 const verticalSearchLogger = (new SearchRequestLogger()).createVerticalSearchLogger();
@@ -16,8 +9,6 @@ fixture`Client-SDK header works on vertical searches/autocomplete`
   .page(`http://localhost:${PORT}/people`)
   .requestHooks(verticalSearchLogger, verticalAutocompleteLogger)
   .beforeEach(async t => {
-    await registerIE11NoCacheHook(t, VERTICAL_SEARCH_URL_REGEX);
-    await registerIE11NoCacheHook(t, VERTICAL_AUTOCOMPLETE_URL_REGEX);
     await t.resizeWindow(1600, 900);
   })
 
@@ -39,8 +30,6 @@ fixture`Client-SDK header works on universal searches/autocomplete`
   .page(`http://localhost:${PORT}`)
   .requestHooks(universalSearchLogger, universalAutocompleteLogger)
   .beforeEach(async t => {
-    await registerIE11NoCacheHook(t, UNIVERSAL_SEARCH_URL_REGEX);
-    await registerIE11NoCacheHook(t, UNIVERSAL_AUTOCOMPLETE_URL_REGEX);
     await t.resizeWindow(1600, 900);
   })
 

tests/acceptance/suites/vertical-full-page-map.js

@@ -4,8 +4,6 @@ import VerticalResults from '../blocks/verticalresults';
 import ThemeMap from '../blocks/thememap';
 import Pagination from '../blocks/pagination';
 import SearchRequestLogger from '../searchrequestlogger';
-import { VERTICAL_SEARCH_URL_REGEX } from '../constants';
-import { registerIE11NoCacheHook } from '../../test-utils/testcafe';
 import CollapsibleFilters from '../blocks/collapsiblefilters'; 
 
 const verticalSearchLogger = SearchRequestLogger.createVerticalSearchLogger();
@@ -14,7 +12,6 @@ fixture`Vertical Full Page Map`
   .page(`http://localhost:${PORT}/locations_full_page_map`)
   .requestHooks(verticalSearchLogger)
   .beforeEach(async t => {
-    await registerIE11NoCacheHook(t, VERTICAL_SEARCH_URL_REGEX);
     await t.resizeWindow(1600, 900);
   })
 
@@ -83,7 +80,6 @@ fixture`Vertical Full Page Map with Filters`
   .page(`http://localhost:${PORT}/locations_full_page_map_with_filters`)
   .requestHooks(verticalSearchLogger)
   .beforeEach(async t => {
-    await registerIE11NoCacheHook(t, VERTICAL_SEARCH_URL_REGEX);
     await t.resizeWindow(1600, 900);
   })