Merge a493cb0 into ab1078a

.github/run_browserstack_acceptance.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+export BROWSERSTACK_USE_AUTOMATE="1"
+export BROWSERSTACK_PROJECT_NAME="Answers SDK"
+export BROWSERSTACK_BUILD_ID="${GITHUB_REF_NAME} - ${GITHUB_RUN_ID} + ${CIRCLE_BUILD_NUM}"
+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
+  echo "inside the if"
+  npx testcafe "browserstack:ie@11.0,browserstack:safari" --config-file ./.github/testcafe.json -q
+else
+  echo "inside the else"
+  npx testcafe -c 2 "browserstack:ie@11.0" --config-file ./.github/testcafe.json -q
+fi

.github/run_headless_acceptance.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [[ $GITHUB_REF_NAME == release/*
+  || $GITHUB_REF_NAME == hotfix/*
+  || $GITHUB_REF_NAME == master
+  || $GITHUB_REF_NAME == support/* ]]
+then
+  echo "inside the if"
+  npx testcafe -c 3 "chrome:headless,firefox:headless" --config-file ./.github/testcafe.json -q
+else
+  echo "inside the else"
+  npx testcafe -c 3 "chrome:headless" --config-file ./.github/testcafe.json -q
+fi

.circleci/run_useragent_acceptance.sh → .github/run_useragent_acceptance.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
+
 export BROWSERSTACK_USE_AUTOMATE="1"
 export BROWSERSTACK_PROJECT_NAME="Answers SDK"
-export BROWSERSTACK_BUILD_ID="${CIRCLE_BRANCH} - ${CIRCLE_BUILD_NUM}"
+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
 
-npx testcafe chrome:headless,firefox:headless,browserstack:safari,browserstack:edge tests/acceptance/useragent/useragentsuite.js --config-file ./.circleci/testcafe.json
+npx testcafe chrome:headless,firefox:headless,browserstack:safari,browserstack:edge tests/acceptance/useragent/useragentsuite.js --config-file ./.github/testcafe.json

.github/workflows/acceptance.yml

@@ -0,0 +1,70 @@
+name: Run acceptance tests
+
+on:
+  workflow_call:
+    secrets:
+      BROWSERSTACK_USERNAME:
+        required: true
+      BROWSERSTACK_ACCESS_KEY:
+        required: true
+
+jobs:
+  headless_acceptance:
+    name: Headless Acceptance
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js 14
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14
+          cache: 'npm'
+      - run: npm ci
+      - name: Download build-output artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: build-output
+          path: dist/
+      - run: ./.github/run_headless_acceptance.sh
+
+  browserstack_acceptance:
+    name: Browserstack Acceptance
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js 14
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14
+          cache: 'npm'
+      - run: npm ci
+      - name: Download build-output artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: build-output
+          path: dist/
+      - run: ./.github/run_browserstack_acceptance.sh
+        env:
+          BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
+          BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
+
+  useragent:
+    name: Useragent Acceptance
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js 14
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14
+          cache: 'npm'
+      - run: npm ci
+      - name: Download build-output artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: build-output
+          path: dist/
+      - run: ./.github/run_useragent_acceptance.sh
+        env:
+          BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
+          BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}

.github/workflows/build_and_deploy.yml

@@ -5,7 +5,6 @@ on:
     branches-ignore:
       - develop
       - master
-      - support/**
       - hotfix/**
       - feature/**-i18n
       - release/**
@@ -18,6 +17,13 @@ jobs:
     uses: ./.github/workflows/unit_test.yml
     needs: call_build
 
+  call_acceptance:
+    uses: ./.github/workflows/acceptance.yml
+    needs: call_build
+    secrets:
+      BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
+      BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
+
   format_branch_name:
     runs-on: ubuntu-latest
     outputs:
@@ -34,6 +40,7 @@ jobs:
     needs: 
       - call_unit_test
       - format_branch_name
+      - call_acceptance
     uses: ./.github/workflows/deploy.yml
     with:
       directory: dev/${{ needs.format_branch_name.outputs.formatted_branch }}
@@ -43,4 +50,4 @@ jobs:
 
 concurrency:
   group: ci-build-and-deploy-${{ github.ref }}-1
-  cancel-in-progress: true
+  cancel-in-progress: true

package.json

@@ -119,7 +119,7 @@
     "docs": "jsdoc -R README.md -d docs/ -r src/",
     "lint": "eslint .",
     "test": "eslint . && stylelint src/**/*.scss && cross-env NODE_ICU_DATA=node_modules/full-icu jest",
-    "acceptance": "testcafe safari,chrome --config-file ./.circleci/testcafe.json",
+    "acceptance": "testcafe safari,chrome --config-file ./.github/testcafe.json",
     "wcag": "./tests/acceptance/wcag/index.js",
     "size": "size-limit",
     "fix": "eslint . --fix",

tests/acceptance/blocks/filtersearchcomponent.js

@@ -23,6 +23,6 @@ export default class FilterSearchComponentBlock {
       .typeText(this._input, displayValue)
       .pressKey('space')
       .wait(500)
-      .click(this._selector.find('.js-yext-autocomplete-option').withText(displayValue));
+      .click(this._selector.find('.js-yext-autocomplete-option').withExactText(displayValue));
   }
 }

tests/acceptance/fixtures/html/facets.html

@@ -46,6 +46,8 @@
         verticalKey: 'people',
       },
       onReady: function () {
+        this.setGeolocation(38.8955, -77.0699);
+
         this.addComponent('SearchBar', {
           container: '.search-bar-container',
           clearButton: true,

tests/acceptance/fixtures/html/facetsonload.html

@@ -46,6 +46,8 @@
         verticalKey: 'people',
       },
       onReady: function () {
+        this.setGeolocation(38.8955, -77.0699);
+
         this.addComponent('SearchBar', {
           container: '.search-bar-container',
           clearButton: true,

tests/acceptance/fixtures/html/filterbox.html

@@ -49,6 +49,8 @@
         defaultInitialSearch: ''
       },
       onReady: function () {
+        this.setGeolocation(38.8955, -77.0699);
+
         this.addComponent('SearchBar', {
           container: '.search-bar-container',
           clearButton: true,

tests/acceptance/fixtures/html/no-unsafe-eval.html

@@ -27,6 +27,8 @@
         defaultInitialSearch: 'virginia'
       },
       onReady: function () {
+        this.setGeolocation(38.8955, -77.0699);
+
         this.addComponent('SearchBar', {
           container: '.search-bar-container',
           verticalKey: 'people'

tests/acceptance/fixtures/html/searchbaronly.html

@@ -19,6 +19,8 @@
         experienceVersion: 'PRODUCTION',
         templateBundle: TemplateBundle.default,
         onReady: function() {
+          this.setGeolocation(38.8955, -77.0699);
+
           this.addComponent('SearchBar', {
             container: '.search-bar-container',
             clearButton: true,

tests/acceptance/fixtures/html/universal.html

@@ -21,6 +21,8 @@
                 experienceVersion: 'PRODUCTION',
                 templateBundle: TemplateBundle.default,
                 onReady: function() {
+                    this.setGeolocation(38.8955, -77.0699);
+
                     this.addComponent('SearchBar', {
                         container: '.search-bar-container',
                         clearButton: true,

tests/acceptance/fixtures/html/universalinitialsearch.html

@@ -25,6 +25,8 @@
         defaultInitialSearch: ''
       },
       onReady: function () {
+        this.setGeolocation(38.8955, -77.0699);
+
         this.addComponent('SearchBar', {
           container: '.search-bar-container',
           clearButton: true,

tests/acceptance/fixtures/html/vertical.html

@@ -31,6 +31,8 @@
                   displayAllResults: true
                 },
                 onReady: function() {
+                    this.setGeolocation(38.8955, -77.0699);
+
                     this.addComponent('SearchBar', {
                         container: '.search-bar-container',
                         verticalKey:'KM',