From 6e946ca31d9ebc92bd3d3c9e329400875f858b24 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 27 Feb 2018 21:10:35 -0700
Subject: [PATCH] ammended browserstack test

---
 .circleci/config.yml | 3 +++
 .circleci/e2e.sh     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e6d65a646..f17eaacf4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -126,6 +126,7 @@ jobs:
     <<: *integration_job
     environment:
       <<: *integration_environment
+      BROWSERSTACK: true
       E2E_BROWSERS: chrome
   
   # test_integration_firefox will run the integration tests with firefox in
@@ -134,6 +135,7 @@ jobs:
     <<: *integration_job
     environment:
       <<: *integration_environment
+      BROWSERSTACK: true
       E2E_BROWSERS: firefox
   
   # test_integration_edge will run the integration tests with edge in
@@ -142,6 +144,7 @@ jobs:
     <<: *integration_job
     environment:
       <<: *integration_environment
+      BROWSERSTACK: true
       E2E_BROWSERS: edge
   
   # deploy will deploy the application as a docker image.
diff --git a/.circleci/e2e.sh b/.circleci/e2e.sh
index c7606668f..2d9fc25af 100755
--- a/.circleci/e2e.sh
+++ b/.circleci/e2e.sh
@@ -19,7 +19,7 @@ if [[ "${E2E_DISABLE}" == "true" ]]; then
   exit
 fi
 
-if [[ -n "$BROWSERSTACK_KEY" ]]; then
+if [[ "$BROWSERSTACK" == "true" && -n "$BROWSERSTACK_KEY" ]]; then
   echo Testing on browserstack
   node scripts/e2e.js --reports-folder "$REPORTS_FOLDER" --retries "$E2E_MAX_RETRIES" --timeout "$E2E_WAIT_FOR_TIMEOUT" --browsers "$E2E_BROWSERS" --browserstack
 else