From 8db8e60a381ebe29cd477be6e593067efaa7c859 Mon Sep 17 00:00:00 2001
From: Ben Alpert <spicyjalapeno@gmail.com>
Date: Mon, 19 May 2014 10:32:25 -0700
Subject: [PATCH] Don't fail Travis on sauce failures

Fixes #1496.
---
 .travis.yml  |  6 ++++--
 Gruntfile.js | 11 +++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b754482a50..e0987d4922 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ script:
     grunt $TEST_TYPE
 after_script:
 - |
-    if [ "$TEST_TYPE" = test:full ] && [ "$SERVER" ]; then
+    if [ "$TEST_TYPE" = test ] && [ "$SERVER" ]; then
       grunt build
       curl \
         -F "react=@build/react.js" \
@@ -26,10 +26,11 @@ after_script:
     fi
 env:
   matrix:
-  - TEST_TYPE=test:full
+  - TEST_TYPE=test
   - TEST_TYPE=lint
   - TEST_TYPE=perf:full
   - TEST_TYPE=test:coverage
+  - TEST_TYPE=test:webdriver:saucelabs:modern
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie11
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie9
@@ -47,6 +48,7 @@ matrix:
     - env: TEST_TYPE=lint
     - env: TEST_TYPE=test:coverage
     - env: TEST_TYPE=perf:full
+    - env: TEST_TYPE=test:webdriver:saucelabs:modern
     - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie11
     - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
     - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie9
diff --git a/Gruntfile.js b/Gruntfile.js
index 648f116c05..de406e42ca 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -149,6 +149,17 @@ module.exports = function(grunt) {
     'webdriver-jasmine:saucelabs_' + (process.env.BROWSER_NAME || 'ie8')
   ]);
 
+  grunt.registerTask('test:webdriver:saucelabs:modern', [
+    'build:test',
+    'build:basic',
+
+    'connect',
+    'sauce-tunnel',
+    'webdriver-jasmine:saucelabs_android',
+    'webdriver-jasmine:saucelabs_firefox',
+    'webdriver-jasmine:saucelabs_chrome'
+  ]);
+
   grunt.registerTask('test:webdriver:saucelabs:ie', [
     'build:test',
     'build:basic',