fix(tavis): fix karma config for browserstack (#156)

akveo · Jan 19, 2018 · d5a4873 · d5a4873
1 parent b97ee8f
commit d5a4873
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ env:
     - SAUCE_USERNAME=nixa
     - SAUCE_ACCESS_KEY=a922753805a4-7538-6644-c450-48fdf18c
     - BROWSER_STACK_USERNAME=debac1
-    - BROWSER_STACK_ACCESS_KEY=V5ykpyxrTxXLSsRBmXpL
+    - BROWSER_STACK_KEY=V5ykpyxrTxXLSsRBmXpL
     - BROWSER_PROVIDER_READY_FILE=/tmp/nebular/readyfile
     - BROWSER_PROVIDER_ERROR_FILE=/tmp/nebular/errorfile
     - LOGS_DIR=/tmp/nebular/logs
@@ -30,7 +30,6 @@ matrix:
   allow_failures:
     - env: "MODE=sauce_e2e"
     - env: "MODE=sauce_unit_test"
-    - env: "MODE=browserstack_unit_test"
 
 install:
   - npm install

diff --git a/karma.conf.js b/karma.conf.js
@@ -46,7 +46,9 @@ module.exports = function (config) {
       BrowserstackChromeCI: {
         base: 'BrowserStack',
         browser: 'Chrome',
-        version: 'latest'
+        version: 'latest',
+        os: 'Windows',
+        os_version: '10'
       }
     },
     browserConsoleLogOptions: {
@@ -70,7 +72,7 @@ module.exports = function (config) {
       pollingTimeout: 20000,
       video: false,
     },
-    singleRun: false
+    singleRun: true
   };
 
   if (process.env['TRAVIS']) {

diff --git a/scripts/ci/browserstack/config.js b/scripts/ci/browserstack/config.js
@@ -1 +1 @@
-module.exports = process.env.BROWSER_STACK_ACCESS_KEY.split('').reverse().join('');
+module.exports = process.env.BROWSER_STACK_KEY.split('').reverse().join('');
diff --git a/scripts/ci/browserstack/start-tunnel.sh b/scripts/ci/browserstack/start-tunnel.sh
@@ -11,7 +11,7 @@ TUNNEL_URL="https://www.browserstack.com/browserstack-local/${TUNNEL_FILE}"
 TUNNEL_DIR="/tmp/browserstack-tunnel"
 TUNNEL_LOG="${LOGS_DIR}/browserstack-tunnel.log"
 
-BROWSER_STACK_ACCESS_KEY=`echo ${BROWSER_STACK_ACCESS_KEY} | rev`
+BROWSER_STACK_KEY=`echo ${BROWSER_STACK_KEY} | rev`
 
 # Cleanup and create the folder structure for the tunnel connector.
 rm -rf ${TUNNEL_DIR} ${BROWSER_PROVIDER_READY_FILE}
@@ -63,7 +63,7 @@ function create_ready_file {
   touch ${BROWSER_PROVIDER_READY_FILE}
 }
 
-browserstack-tunnel/BrowserStackLocal -k ${BROWSER_STACK_ACCESS_KEY} ${ARGS} 2>&1 >> ${TUNNEL_LOG} &
+browserstack-tunnel/BrowserStackLocal -k ${BROWSER_STACK_KEY} ${ARGS} 2>&1 >> ${TUNNEL_LOG} &
 
 # Wait for the tunnel to be ready and create the readyfile with the Browserstack PID
 create_ready_file &
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		module.exports = process.env.BROWSER_STACK_ACCESS_KEY.split('').reverse().join('');
		module.exports = process.env.BROWSER_STACK_KEY.split('').reverse().join('');