From 25f96f61d3b7204eac0ff4cb1c9ba18499cd44bf Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Fri, 28 Oct 2016 10:12:10 +0200
Subject: [PATCH 1/4] run tests in parallel

---
 ci/browser_tests.sh | 20 +-------------------
 package.json        |  3 ++-
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/ci/browser_tests.sh b/ci/browser_tests.sh
index 658337b521..30b3088df1 100755
--- a/ci/browser_tests.sh
+++ b/ci/browser_tests.sh
@@ -17,25 +17,7 @@ while [ ! -f $SAUCECONNECT_READYFILE ]; do
   sleep .5
 done
 
-npm run nightwatch_remote_firefox
-if [ $? -eq 1 ]
-then
-  TEST_EXITCODE=1
-fi
-
-npm run nightwatch_remote_chrome
-if [ $? -eq 1 ]
-then
-  TEST_EXITCODE=1
-fi
-
-npm run nightwatch_remote_safari
-if [ $? -eq 1 ]
-then
-  TEST_EXITCODE=1
-fi
-
-npm run nightwatch_remote_ie
+npm run nightwatch_remote_parallel
 if [ $? -eq 1 ]
 then
   TEST_EXITCODE=1
diff --git a/package.json b/package.json
index 6be9f42e93..8632202dd0 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,8 @@
     "nightwatch_remote_firefox": "nightwatch --config nightwatch.js --env default",
     "nightwatch_remote_chrome": "nightwatch --config nightwatch.js --env chrome",
     "nightwatch_remote_safari": "nightwatch --config nightwatch.js --env safari",
-    "nightwatch_remote_ie": "nightwatch --config nightwatch.js --env ie"
+    "nightwatch_remote_ie": "nightwatch --config nightwatch.js --env ie",
+    "nightwatch_remote_parallel": "nightwatch --config nightwatch.js --env ie,safari,chrome,default"
   },
   "repository": {
     "type": "git",

From 9c351866020e7ce691a7ef08cbdb9f187a1d2fd2 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Fri, 28 Oct 2016 10:13:54 +0200
Subject: [PATCH 2/4] sauceconnect version + stopexecution on error

---
 ci/browser_tests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ci/browser_tests.sh b/ci/browser_tests.sh
index 30b3088df1..d99d27dc0c 100755
--- a/ci/browser_tests.sh
+++ b/ci/browser_tests.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
-SAUCECONNECT_URL="https://saucelabs.com/downloads/sc-4.3.16-linux.tar.gz"
+set -e
+
+SC_VERSION="4.4.0"
+SAUCECONNECT_URL="https://saucelabs.com/downloads/sc-$SC_VERSION-linux.tar.gz"
 SAUCECONNECT_USERNAME="yanneth"
 SAUCECONNECT_ACCESSKEY="1f5a4560-b02b-41aa-b52b-f033aad30870"
 SAUCECONNECT_JOBIDENTIFIER="remix_tests_${TRAVIS_JOB_NUMBER}"

From 0daf847566860e1f0014fad475296472965a318b Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Fri, 28 Oct 2016 10:23:43 +0200
Subject: [PATCH 3/4] improve sauce labs

---
 ci/browser_tests.sh | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/ci/browser_tests.sh b/ci/browser_tests.sh
index d99d27dc0c..c0326f734a 100755
--- a/ci/browser_tests.sh
+++ b/ci/browser_tests.sh
@@ -14,17 +14,13 @@ npm run build
 npm run serve &
 
 wget $SAUCECONNECT_URL
-tar -zxvf sc-4.3.16-linux.tar.gz
-./sc-4.3.16-linux/bin/sc -u $SAUCECONNECT_USERNAME -k $SAUCECONNECT_ACCESSKEY -i $SAUCECONNECT_JOBIDENTIFIER --readyfile $SAUCECONNECT_READYFILE &
+tar -zxvf sc-"$SC_VERSION"-linux.tar.gz
+./sc-"$SC_VERSION"-linux/bin/sc -u $SAUCECONNECT_USERNAME -k $SAUCECONNECT_ACCESSKEY -i $SAUCECONNECT_JOBIDENTIFIER --readyfile $SAUCECONNECT_READYFILE &
 while [ ! -f $SAUCECONNECT_READYFILE ]; do
   sleep .5
 done
 
-npm run nightwatch_remote_parallel
-if [ $? -eq 1 ]
-then
-  TEST_EXITCODE=1
-fi
+npm run nightwatch_remote_parallel || TEST_EXITCODE=1
 
 node ci/sauceDisconnect.js $SAUCECONNECT_USERNAME $SAUCECONNECT_ACCESSKEY $SAUCECONNECT_JOBIDENTIFIER
 

From 67463a90178653d946919dd15064dd33ebdaffb1 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Fri, 28 Oct 2016 10:38:26 +0200
Subject: [PATCH 4/4] remove cache

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index eb6e4e4d37..4c420f1a91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,4 +10,5 @@ deploy:
   skip_cleanup: true
   on:
         branch: master
+cache: false