From b9e8faf4e996880eff01aeb1ae466e4bad0065ec Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 11 Jul 2016 10:44:23 +0200
Subject: [PATCH 1/2] quick changes

---
 ci/browser_tests.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 ci/browser_tests.sh

diff --git a/ci/browser_tests.sh b/ci/browser_tests.sh
old mode 100644
new mode 100755

From 6a4cde43b4cc730f8e5b82af6eda56d5d0d55498 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 11 Jul 2016 12:40:27 +0200
Subject: [PATCH 2/2] fix tests

---
 .travis.yml         |  2 +-
 ci/browser_tests.sh | 24 ++++++------------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9fbd2efcdc..eb6e4e4d37 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ node_js:
   - stable
 script: 
   - npm run test
-  - bash ci/browser_tests.sh
+  - ./ci/browser_tests.sh
 deploy:
   provider: script
   script: ci/deploy_from_travis.sh
diff --git a/ci/browser_tests.sh b/ci/browser_tests.sh
index bb54f2d838..56cba7b2d8 100755
--- a/ci/browser_tests.sh
+++ b/ci/browser_tests.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 
-SAUCECONNECT_URL="http://saucelabs.com/downloads/sc-4.3.16-linux.tar.gz"
+SAUCECONNECT_URL="https://saucelabs.com/downloads/sc-4.3.16-linux.tar.gz"
 SAUCECONNECT_USERNAME="yann300"
 SAUCECONNECT_ACCESSKEY="e6f430f2-daa0-48bb-90fd-8bee20f429eb"
 SAUCECONNECT_JOBIDENTIFIER="remix_tests_${TRAVIS_JOB_NUMBER}"
@@ -18,22 +18,10 @@ while [ ! -f $SAUCECONNECT_READYFILE ]; do
   sleep .5
 done
 
-function updateTestExitCode() {
-  if [ $? -eq 1 ]
-  then
-    TEST_EXITCODE=1
-  fi  
-}
-
-npm run nightwatch_remote_firefox
-updateTestExitCode
-npm run nightwatch_remote_chrome
-updateTestExitCode
-npm run nightwatch_remote_safari
-updateTestExitCode
-npm run nightwatch_remote_ie
-updateTestExitCode
-
+npm run nightwatch_remote_firefox || TEST_EXITCODE=1
+npm run nightwatch_remote_chrome || TEST_EXITCODE=1
+npm run nightwatch_remote_safari || TEST_EXITCODE=1
+npm run nightwatch_remote_ie || TEST_EXITCODE=1
 
 node ci/sauceDisconnect.js $SAUCECONNECT_USERNAME $SAUCECONNECT_ACCESSKEY $SAUCECONNECT_JOBIDENTIFIER