Merge branch 'develop' into feature/rebased-standalone-search-bar

yext · Aug 18, 2021 · 2995740 · 2995740
2 parents 2f63d2c + 7d35d6d
commit 2995740
Show file tree

Hide file tree

Showing 11 changed files with 275 additions and 157 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -102,6 +102,15 @@ jobs:
       - attach_workspace:
           at: ~/answers
       - run: ./.circleci/run_browserstack_acceptance.sh
+  useragent_acceptance_test:
+    docker:
+      - image: circleci/node:14.5-browsers
+    working_directory: ~/answers
+    steps:
+      - setup-workspace
+      - attach_workspace:
+          at: ~/answers
+      - run: ./.circleci/run_useragent_acceptance.sh
   # verify all translations are present
   translation_test:
     docker:
@@ -188,13 +197,17 @@ workflows:
       - browserstack_acceptance_test:
           requires:
             - build
+      - useragent_acceptance_test:
+          requires:
+            - build
       - translation_test:
           requires:
             - build
       - deploy_branch:
           requires:
             - unit_test
             - browserstack_acceptance_test
+            - useragent_acceptance_test
             - headless_acceptance_test
   build_and_deploy_i18n:
     jobs:
@@ -216,6 +229,9 @@ workflows:
       - browserstack_acceptance_test:
           requires:
             - build_i18n
+      - useragent_acceptance_test:
+          requires:
+            - build_i18n
       - translation_test:
           requires:
             - build_i18n
@@ -227,6 +243,7 @@ workflows:
           requires:
             - unit_test
             - browserstack_acceptance_test
+            - useragent_acceptance_test
             - headless_acceptance_test
             - translation_test
       - deploy_canary:
@@ -237,6 +254,7 @@ workflows:
             - unit_test
             - headless_acceptance_test
             - browserstack_acceptance_test
+            - useragent_acceptance_test
   build_and_deploy_hold:
     jobs:
       - build_i18n:
@@ -264,6 +282,12 @@ workflows:
               only: /^v.*/
           requires:
             - build_i18n
+      - useragent_acceptance_test:
+          filters:
+            tags:
+              only: /^v.*/
+          requires:
+            - build_i18n
       - translation_test:
           filters:
             tags:
@@ -278,6 +302,7 @@ workflows:
           requires:
             - unit_test
             - browserstack_acceptance_test
+            - useragent_acceptance_test
             - headless_acceptance_test
             - translation_test
       - deploy_latest:

diff --git a/.circleci/run_browserstack_acceptance.sh b/.circleci/run_browserstack_acceptance.sh
@@ -10,7 +10,7 @@ if [[ $CIRCLE_BRANCH == release/*
   || $CIRCLE_BRANCH == master
   || $CIRCLE_BRANCH == support/* ]]
 then
-  npx testcafe "browserstack:ie@11.0,browserstack:safari" --config-file ./.circleci/testcafe.json
+  npx testcafe "browserstack:ie@11.0,browserstack:safari" --config-file ./.circleci/testcafe.json -q
 else
-  npx testcafe -c 2 "browserstack:ie@11.0" --config-file ./.circleci/testcafe.json
+  npx testcafe -c 2 "browserstack:ie@11.0" --config-file ./.circleci/testcafe.json -q
 fi
diff --git a/.circleci/run_headless_acceptance.sh b/.circleci/run_headless_acceptance.sh
@@ -5,7 +5,7 @@ if [[ $CIRCLE_BRANCH == release/*
   || $CIRCLE_BRANCH == master
   || $CIRCLE_BRANCH == support/* ]]
 then
-  npx testcafe -c 3 "chrome:headless,firefox:headless" --config-file ./.circleci/testcafe.json
+  npx testcafe -c 3 "chrome:headless,firefox:headless" --config-file ./.circleci/testcafe.json -q
 else
-  npx testcafe -c 3 "chrome:headless" --config-file ./.circleci/testcafe.json
+  npx testcafe -c 3 "chrome:headless" --config-file ./.circleci/testcafe.json -q
 fi
diff --git a/.circleci/run_useragent_acceptance.sh b/.circleci/run_useragent_acceptance.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+export BROWSERSTACK_USE_AUTOMATE="1"
+export BROWSERSTACK_PROJECT_NAME="Answers SDK"
+export BROWSERSTACK_BUILD_ID="${CIRCLE_BRANCH} - ${CIRCLE_BUILD_NUM}"
+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
diff --git a/.circleci/testcafe.json b/.circleci/testcafe.json
@@ -1,6 +1,5 @@
 {
   "src": ["tests/acceptance/acceptancesuites/*.js", "!tests/acceptance/acceptancesuites/searchbaronlysuite.js"],
-  "quarantineMode": true,
   "appCommand": "npx serve -l tcp://0.0.0.0:9999",
   "appInitDelay": 4000
 }
diff --git a/conf/i18n/translations/messages.pot b/conf/i18n/translations/messages.pot
@@ -127,7 +127,7 @@ msgstr ""
 msgid "Showing <em class=\"yxt-AlternativeVerticals-noResultsInfo--emphasized\">all [[currentVerticalLabel]]</em> instead."
 msgstr ""
 
-#: src/ui/speechrecognition/speechrecognizer.js:96
+#: src/ui/speechrecognition/speechrecognizer.js:95
 msgid "Speech Recognition is not available."
 msgstr ""