From a13bd1e251742105e1573d632749a60dca5fea54 Mon Sep 17 00:00:00 2001
From: Thomas Aylott <aylott@fb.com>
Date: Tue, 3 Dec 2013 16:15:10 -0500
Subject: [PATCH 01/15] simplify travis script

---
 .travis.yml  | 6 +-----
 Gruntfile.js | 2 ++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3bd3de140e038..a29f3c51148b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,7 @@ node_js:
 - '0.10'
 script:
 - |
-    if [ "$TEST_TYPE" = unit ]; then
-      grunt build && grunt test
-    else
-      grunt lint
-    fi
+    grunt $TEST_TYPE
 after_script:
 - |
     if [ "$TEST_TYPE" = unit ] && [ "$SERVER" ]; then
diff --git a/Gruntfile.js b/Gruntfile.js
index 823e5f172af6f..f7e427026f9b9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -35,6 +35,8 @@ module.exports = function(grunt) {
     .filter(function(npmTaskName) { return npmTaskName != 'grunt-cli'; })
     .forEach(function(npmTaskName) { grunt.loadNpmTasks(npmTaskName); });
 
+  grunt.registerTask('unit', ['build', 'test']);
+
   // Alias 'jshint' to 'lint' to better match the workflow we know
   grunt.registerTask('lint', ['jshint']);
 

From 18459deb77d46fc7ff8e2ea682162a96c61d5b3a Mon Sep 17 00:00:00 2001
From: Thomas Aylott <aylott@fb.com>
Date: Tue, 3 Dec 2013 17:52:44 -0500
Subject: [PATCH 02/15] enable IE browser testing in travis

---
 .travis.yml  |  9 +++++++++
 Gruntfile.js | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index a29f3c51148b2..cb615b5e241ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,10 @@ env:
   matrix:
   - TEST_TYPE=unit
   - TEST_TYPE=lint
+  - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie11
+  - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
+  - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie9
+  - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie8
   global:
   # SERVER
   - secure: qPvsJ46XzGrdIuPA70b55xQNGF8jcK7N1LN5CCQYYocXLa+fBrl+fTE77QvehOPhqwJXcj6kOxI+sY0KrVwV7gmq2XY2HZGWUSCxTN0SZlNIzqPA80Y7G/yOjA4PUt8LKgP+8tptyhTAY56qf+hgW8BoLiKOdztYF2p+3zXOLuA=
@@ -33,8 +37,13 @@ env:
   - secure: eHMg4yQWJ+5zFxNcjVwpdpcbZCQMaSByqJy0wwQ2XOOMItdCvSfO/fa+mYoVND/9Orsi5kvXC9tx4sYHyth5hLrvO+bghYjiayrbxYYrxso6G/aU8Pttc7s/qk3I4zadLlua1kGy2TauByxS6nt9nUDe0FDaJKA9k1QXVlpq5Ac=
   - secure: v65jUPPNBvJg1xhj4cY7wMKinCESUseHsW1d2gp68SluFHHyjWZOvXYXZdABqB/1uNmQxjbUkwkdSNAOn5k7ppjRcRnlAH2uu1xDqXrGp6cW4MfNPchrAe+FcUMtse/3THGJj8SZ9IQWIl+BHv4XASQ7FwqCR8cwlOfhsqdfch8=
 matrix:
+  fast_finish: true
   allow_failures:
     - env: TEST_TYPE=lint
+    - 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
+    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie8
 notifications:
   irc:
     use_notice: true
diff --git a/Gruntfile.js b/Gruntfile.js
index f7e427026f9b9..b81bb33c038c1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -111,6 +111,16 @@ module.exports = function(grunt) {
     'webdriver-phantomjs',
     'webdriver-jasmine:local'
   ]);
+
+  grunt.registerTask('test:webdriver:saucelabs', [
+    'build:test',
+    'build:basic',
+
+    'connect',
+    'sauce-tunnel',
+    'webdriver-jasmine:saucelabs_' + (process.env.BROWSER_NAME || 'ie8'),
+  ]);
+
   grunt.registerTask('test:coverage', [
     'build:test',
     'build:withCodeCoverageLogging',

From e560229c83ba2aec1223c3ac5f4950cecdfcddf8 Mon Sep 17 00:00:00 2001
From: Thomas Aylott <aylott@fb.com>
Date: Tue, 3 Dec 2013 18:22:20 -0500
Subject: [PATCH 03/15] secure tokens aren't available for pull requests

Now you can use the saucelabs jazz locally also.
---
 .travis.yml                       | 2 --
 grunt/config/webdriver-jasmine.js | 5 ++---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cb615b5e241ef..b73c02a8eef78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,8 +34,6 @@ env:
   - secure: qPvsJ46XzGrdIuPA70b55xQNGF8jcK7N1LN5CCQYYocXLa+fBrl+fTE77QvehOPhqwJXcj6kOxI+sY0KrVwV7gmq2XY2HZGWUSCxTN0SZlNIzqPA80Y7G/yOjA4PUt8LKgP+8tptyhTAY56qf+hgW8BoLiKOdztYF2p+3zXOLuA=
   # SECRET_TOKEN
   - secure: dkpPW+VnoqC/okhRdV90m36NcyBFhcwEKL3bNFExAwi0dXnFao8RoFlvnwiPlA23h2faROkMIetXlti6Aju08BgUFV+f9aL6vLyU7gUent4Nd3413zf2fwDtXIWIETg6uLnOpSykGKgCAT/hY3Q2oPLqOoY0OxfgnbqwxkxljrE=
-  - secure: eHMg4yQWJ+5zFxNcjVwpdpcbZCQMaSByqJy0wwQ2XOOMItdCvSfO/fa+mYoVND/9Orsi5kvXC9tx4sYHyth5hLrvO+bghYjiayrbxYYrxso6G/aU8Pttc7s/qk3I4zadLlua1kGy2TauByxS6nt9nUDe0FDaJKA9k1QXVlpq5Ac=
-  - secure: v65jUPPNBvJg1xhj4cY7wMKinCESUseHsW1d2gp68SluFHHyjWZOvXYXZdABqB/1uNmQxjbUkwkdSNAOn5k7ppjRcRnlAH2uu1xDqXrGp6cW4MfNPchrAe+FcUMtse/3THGJj8SZ9IQWIl+BHv4XASQ7FwqCR8cwlOfhsqdfch8=
 matrix:
   fast_finish: true
   allow_failures:
diff --git a/grunt/config/webdriver-jasmine.js b/grunt/config/webdriver-jasmine.js
index fd4548595c40e..b01660ddeb81c 100644
--- a/grunt/config/webdriver-jasmine.js
+++ b/grunt/config/webdriver-jasmine.js
@@ -27,9 +27,8 @@ exports.saucelabs = {
   webdriver: {
     remote: {
       /* https://github.com/admc/wd/blob/master/README.md#named-parameters */
-      user: process.env.SAUCE_USERNAME,
-      pwd: process.env.SAUCE_ACCESS_KEY,
-
+      user: process.env.SAUCE_USERNAME || 'React',
+      pwd: process.env.SAUCE_ACCESS_KEY || '339d32ca-d594-4570-a3c2-94c50a91919b',
       protocol: 'http:',
       hostname: 'ondemand.saucelabs.com',
       port: '80',

From e944b68e8cb855f626d6678df31569a80fe0cc9e Mon Sep 17 00:00:00 2001
From: Thomas Aylott <aylott@fb.com>
Date: Wed, 4 Dec 2013 14:27:06 -0500
Subject: [PATCH 04/15] new `grunt test:full` task tests in many browsers

Moved the travis specific stuff back into the travis file
---
 .travis.yml  |  5 +++--
 Gruntfile.js | 18 ++++++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b73c02a8eef78..8a7cabe53d3fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,8 @@ script:
     grunt $TEST_TYPE
 after_script:
 - |
-    if [ "$TEST_TYPE" = unit ] && [ "$SERVER" ]; then
+    if [ "$TEST_TYPE" = test:full ] && [ "$SERVER" ]; then
+      grunt build
       curl \
         -F "react=@build/react.js" \
         -F "react.min=@build/react.min.js" \
@@ -23,7 +24,7 @@ after_script:
     fi
 env:
   matrix:
-  - TEST_TYPE=unit
+  - TEST_TYPE=test:full
   - TEST_TYPE=lint
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie11
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
diff --git a/Gruntfile.js b/Gruntfile.js
index b81bb33c038c1..bd44eb70834f9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -35,8 +35,6 @@ module.exports = function(grunt) {
     .filter(function(npmTaskName) { return npmTaskName != 'grunt-cli'; })
     .forEach(function(npmTaskName) { grunt.loadNpmTasks(npmTaskName); });
 
-  grunt.registerTask('unit', ['build', 'test']);
-
   // Alias 'jshint' to 'lint' to better match the workflow we know
   grunt.registerTask('lint', ['jshint']);
 
@@ -112,6 +110,22 @@ module.exports = function(grunt) {
     'webdriver-jasmine:local'
   ]);
 
+  grunt.registerTask('test:full', [
+    'build:test',
+    'build:basic',
+
+    'connect',
+    'webdriver-phantomjs',
+    'webdriver-jasmine:local',
+
+    'sauce-tunnel',
+    'webdriver-jasmine:saucelabs_ios',
+    'webdriver-jasmine:saucelabs_android',
+    'webdriver-jasmine:saucelabs_firefox',
+    'webdriver-jasmine:saucelabs_chrome',
+    'webdriver-jasmine:saucelabs_safari'
+  ]);
+
   grunt.registerTask('test:webdriver:saucelabs', [
     'build:test',
     'build:basic',

From 3308137d8d6c0c83c411e47f4d0ceaadb561225b Mon Sep 17 00:00:00 2001
From: Thomas Aylott <aylott@fb.com>
Date: Wed, 4 Dec 2013 14:28:38 -0500
Subject: [PATCH 05/15] run tests in old iOS, but allow failures

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

diff --git a/.travis.yml b/.travis.yml
index 8a7cabe53d3fc..36bc1eaf107f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,8 @@ env:
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie9
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie8
+  - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ios4
+  - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ios5
   global:
   # SERVER
   - secure: qPvsJ46XzGrdIuPA70b55xQNGF8jcK7N1LN5CCQYYocXLa+fBrl+fTE77QvehOPhqwJXcj6kOxI+sY0KrVwV7gmq2XY2HZGWUSCxTN0SZlNIzqPA80Y7G/yOjA4PUt8LKgP+8tptyhTAY56qf+hgW8BoLiKOdztYF2p+3zXOLuA=
@@ -43,6 +45,8 @@ matrix:
     - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
     - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie9
     - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie8
+    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ios4
+    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ios5
 notifications:
   irc:
     use_notice: true

From b8ee94d99937ffb31896f0ba2257b3651082cc3f Mon Sep 17 00:00:00 2001
From: Thomas Aylott <aylott@fb.com>
Date: Wed, 4 Dec 2013 14:38:38 -0500
Subject: [PATCH 06/15] define public saucelabs info for everything to use

---
 Gruntfile.js                      | 7 +++++++
 grunt/config/webdriver-jasmine.js | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index bd44eb70834f9..8c8c0754e4558 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -13,6 +13,13 @@ var npmReactTasks = require('./grunt/tasks/npm-react');
 
 module.exports = function(grunt) {
 
+  if (!process.env.SAUCE_USERNAME) {
+    process.env.SAUCE_USERNAME = 'React';
+  }
+  if (!process.env.SAUCE_ACCESS_KEY) {
+    process.env.SAUCE_ACCESS_KEY = '339d32ca-d594-4570-a3c2-94c50a91919b';
+  }
+
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
     copy: require('./grunt/config/copy'),
diff --git a/grunt/config/webdriver-jasmine.js b/grunt/config/webdriver-jasmine.js
index b01660ddeb81c..ff5545a0ead5f 100644
--- a/grunt/config/webdriver-jasmine.js
+++ b/grunt/config/webdriver-jasmine.js
@@ -27,8 +27,8 @@ exports.saucelabs = {
   webdriver: {
     remote: {
       /* https://github.com/admc/wd/blob/master/README.md#named-parameters */
-      user: process.env.SAUCE_USERNAME || 'React',
-      pwd: process.env.SAUCE_ACCESS_KEY || '339d32ca-d594-4570-a3c2-94c50a91919b',
+      user: process.env.SAUCE_USERNAME,
+      pwd: process.env.SAUCE_ACCESS_KEY,
       protocol: 'http:',
       hostname: 'ondemand.saucelabs.com',
       port: '80',

From c6f99c3a8421294dd785bae21f0b9c1d599c7eed Mon Sep 17 00:00:00 2001
From: Thomas Aylott <aylott@fb.com>
Date: Wed, 4 Dec 2013 14:48:10 -0500
Subject: [PATCH 07/15] iOS is failing again. Will debug separately

---
 .travis.yml  | 4 ++--
 Gruntfile.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 36bc1eaf107f6..4a82b74a1e035 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,8 +30,7 @@ env:
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie9
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie8
-  - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ios4
-  - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ios5
+  - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ios6
   global:
   # SERVER
   - secure: qPvsJ46XzGrdIuPA70b55xQNGF8jcK7N1LN5CCQYYocXLa+fBrl+fTE77QvehOPhqwJXcj6kOxI+sY0KrVwV7gmq2XY2HZGWUSCxTN0SZlNIzqPA80Y7G/yOjA4PUt8LKgP+8tptyhTAY56qf+hgW8BoLiKOdztYF2p+3zXOLuA=
@@ -47,6 +46,7 @@ matrix:
     - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie8
     - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ios4
     - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ios5
+    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ios6
 notifications:
   irc:
     use_notice: true
diff --git a/Gruntfile.js b/Gruntfile.js
index 8c8c0754e4558..0fdf36a570bff 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -126,7 +126,7 @@ module.exports = function(grunt) {
     'webdriver-jasmine:local',
 
     'sauce-tunnel',
-    'webdriver-jasmine:saucelabs_ios',
+    // 'webdriver-jasmine:saucelabs_ios',
     'webdriver-jasmine:saucelabs_android',
     'webdriver-jasmine:saucelabs_firefox',
     'webdriver-jasmine:saucelabs_chrome',

From 8e3cb7bd9dfc890a973a47b8de959b9eaf2aa529 Mon Sep 17 00:00:00 2001
From: Thomas Aylott <aylott@fb.com>
Date: Wed, 4 Dec 2013 15:04:48 -0500
Subject: [PATCH 08/15] tests fail in Safai now. unblocking for now.

Add these back in as build blockers once those issues are fixed.
---
 .travis.yml  | 4 ++--
 Gruntfile.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4a82b74a1e035..97288f5acc163 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,7 @@ env:
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie9
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie8
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ios6
+  - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=safari
   global:
   # SERVER
   - secure: qPvsJ46XzGrdIuPA70b55xQNGF8jcK7N1LN5CCQYYocXLa+fBrl+fTE77QvehOPhqwJXcj6kOxI+sY0KrVwV7gmq2XY2HZGWUSCxTN0SZlNIzqPA80Y7G/yOjA4PUt8LKgP+8tptyhTAY56qf+hgW8BoLiKOdztYF2p+3zXOLuA=
@@ -44,9 +45,8 @@ matrix:
     - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
     - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie9
     - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie8
-    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ios4
-    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ios5
     - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ios6
+    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=safari
 notifications:
   irc:
     use_notice: true
diff --git a/Gruntfile.js b/Gruntfile.js
index 0fdf36a570bff..671a8ef594e8a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -126,11 +126,11 @@ module.exports = function(grunt) {
     'webdriver-jasmine:local',
 
     'sauce-tunnel',
-    // 'webdriver-jasmine:saucelabs_ios',
+    // 'webdriver-jasmine:saucelabs_ios', // uncomment once tests pass on iOS
     'webdriver-jasmine:saucelabs_android',
     'webdriver-jasmine:saucelabs_firefox',
     'webdriver-jasmine:saucelabs_chrome',
-    'webdriver-jasmine:saucelabs_safari'
+    // 'webdriver-jasmine:saucelabs_safari' // uncomment once tests pass in Safari
   ]);
 
   grunt.registerTask('test:webdriver:saucelabs', [

From 4af362b75140ed25a8772ff9612fd49691866cab Mon Sep 17 00:00:00 2001
From: Thomas Aylott <aylott@fb.com>
Date: Wed, 4 Dec 2013 15:53:01 -0500
Subject: [PATCH 09/15] combine iOS and IE matrix tests

---
 .travis.yml  | 14 ++++----------
 Gruntfile.js | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 97288f5acc163..2caa1f8dd2d61 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,11 +26,8 @@ env:
   matrix:
   - TEST_TYPE=test:full
   - TEST_TYPE=lint
-  - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie11
-  - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
-  - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie9
-  - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie8
-  - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ios6
+  - TEST_TYPE=test:webdriver:saucelabs:ie
+  - TEST_TYPE=test:webdriver:saucelabs:ios
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=safari
   global:
   # SERVER
@@ -41,11 +38,8 @@ matrix:
   fast_finish: true
   allow_failures:
     - env: TEST_TYPE=lint
-    - 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
-    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie8
-    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ios6
+    - env: TEST_TYPE=test:webdriver:saucelabs:ie
+    - env: TEST_TYPE=test:webdriver:saucelabs:ios
     - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=safari
 notifications:
   irc:
diff --git a/Gruntfile.js b/Gruntfile.js
index 671a8ef594e8a..18c831c455f58 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -142,6 +142,29 @@ module.exports = function(grunt) {
     'webdriver-jasmine:saucelabs_' + (process.env.BROWSER_NAME || 'ie8'),
   ]);
 
+  grunt.registerTask('test:webdriver:saucelabs:ie', [
+    'build:test',
+    'build:basic',
+
+    'connect',
+    'sauce-tunnel',
+    'webdriver-jasmine:saucelabs_ie8',
+    'webdriver-jasmine:saucelabs_ie9',
+    'webdriver-jasmine:saucelabs_ie10',
+    'webdriver-jasmine:saucelabs_ie11'
+  ]);
+
+  grunt.registerTask('test:webdriver:saucelabs:ios', [
+    'build:test',
+    'build:basic',
+
+    'connect',
+    'sauce-tunnel',
+    'webdriver-jasmine:saucelabs_ios6_1',
+    'webdriver-jasmine:saucelabs_ios5_1',
+    'webdriver-jasmine:saucelabs_ios4'
+  ]);
+
   grunt.registerTask('test:coverage', [
     'build:test',
     'build:withCodeCoverageLogging',

From fe8008e67c7264f7ba4f0f2841622f42ca61dea3 Mon Sep 17 00:00:00 2001
From: Thomas Aylott <aylott@fb.com>
Date: Wed, 4 Dec 2013 15:53:17 -0500
Subject: [PATCH 10/15] PICK ALL THE NITS!!!1!

---
 Gruntfile.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 18c831c455f58..8d088999ed3b7 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -126,11 +126,9 @@ module.exports = function(grunt) {
     'webdriver-jasmine:local',
 
     'sauce-tunnel',
-    // 'webdriver-jasmine:saucelabs_ios', // uncomment once tests pass on iOS
     'webdriver-jasmine:saucelabs_android',
     'webdriver-jasmine:saucelabs_firefox',
-    'webdriver-jasmine:saucelabs_chrome',
-    // 'webdriver-jasmine:saucelabs_safari' // uncomment once tests pass in Safari
+    'webdriver-jasmine:saucelabs_chrome'
   ]);
 
   grunt.registerTask('test:webdriver:saucelabs', [
@@ -139,7 +137,7 @@ module.exports = function(grunt) {
 
     'connect',
     'sauce-tunnel',
-    'webdriver-jasmine:saucelabs_' + (process.env.BROWSER_NAME || 'ie8'),
+    'webdriver-jasmine:saucelabs_' + (process.env.BROWSER_NAME || 'ie8')
   ]);
 
   grunt.registerTask('test:webdriver:saucelabs:ie', [

From a41c20d43bf844219e4804aabd97fbbe010de715 Mon Sep 17 00:00:00 2001
From: Thomas Aylott <aylott@fb.com>
Date: Wed, 4 Dec 2013 16:03:27 -0500
Subject: [PATCH 11/15] sets each IE separately for now

---
 .travis.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2caa1f8dd2d61..d996b85ed2ac4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,10 @@ env:
   matrix:
   - TEST_TYPE=test:full
   - TEST_TYPE=lint
-  - TEST_TYPE=test:webdriver:saucelabs:ie
+  - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie11
+  - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
+  - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie9
+  - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie8
   - TEST_TYPE=test:webdriver:saucelabs:ios
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=safari
   global:
@@ -38,7 +41,10 @@ matrix:
   fast_finish: true
   allow_failures:
     - env: TEST_TYPE=lint
-    - env: TEST_TYPE=test:webdriver:saucelabs:ie
+    - 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
+    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie8
     - env: TEST_TYPE=test:webdriver:saucelabs:ios
     - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=safari
 notifications:

From 1b477fa40c2146d9f938524275ed6e1ff9f79c82 Mon Sep 17 00:00:00 2001
From: Thomas Aylott <aylott@fb.com>
Date: Fri, 6 Dec 2013 15:46:09 -0500
Subject: [PATCH 12/15] move sauce labs config out of the Gruntfile

---
 Gruntfile.js                      | 7 -------
 grunt/config/webdriver-jasmine.js | 4 ++--
 grunt/tasks/sauce-tunnel.js       | 4 ++--
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 8d088999ed3b7..49db0447a925a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -13,13 +13,6 @@ var npmReactTasks = require('./grunt/tasks/npm-react');
 
 module.exports = function(grunt) {
 
-  if (!process.env.SAUCE_USERNAME) {
-    process.env.SAUCE_USERNAME = 'React';
-  }
-  if (!process.env.SAUCE_ACCESS_KEY) {
-    process.env.SAUCE_ACCESS_KEY = '339d32ca-d594-4570-a3c2-94c50a91919b';
-  }
-
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
     copy: require('./grunt/config/copy'),
diff --git a/grunt/config/webdriver-jasmine.js b/grunt/config/webdriver-jasmine.js
index ff5545a0ead5f..b01660ddeb81c 100644
--- a/grunt/config/webdriver-jasmine.js
+++ b/grunt/config/webdriver-jasmine.js
@@ -27,8 +27,8 @@ exports.saucelabs = {
   webdriver: {
     remote: {
       /* https://github.com/admc/wd/blob/master/README.md#named-parameters */
-      user: process.env.SAUCE_USERNAME,
-      pwd: process.env.SAUCE_ACCESS_KEY,
+      user: process.env.SAUCE_USERNAME || 'React',
+      pwd: process.env.SAUCE_ACCESS_KEY || '339d32ca-d594-4570-a3c2-94c50a91919b',
       protocol: 'http:',
       hostname: 'ondemand.saucelabs.com',
       port: '80',
diff --git a/grunt/tasks/sauce-tunnel.js b/grunt/tasks/sauce-tunnel.js
index b762a22a952a3..d785f1f2387e5 100644
--- a/grunt/tasks/sauce-tunnel.js
+++ b/grunt/tasks/sauce-tunnel.js
@@ -7,12 +7,12 @@ module.exports = function() {
   var task = this;
   var shouldStayAliveForever = task.flags.keepalive;
 
-  var SAUCE_ACCESS_KEY = process.env.SAUCE_ACCESS_KEY;
+  var SAUCE_ACCESS_KEY = process.env.SAUCE_ACCESS_KEY || '339d32ca-d594-4570-a3c2-94c50a91919b';
   if (!SAUCE_ACCESS_KEY) {
     grunt.fatal('Requires the environment variable SAUCE_ACCESS_KEY to be set');
   }
 
-  var SAUCE_USERNAME = process.env.SAUCE_USERNAME;
+  var SAUCE_USERNAME = process.env.SAUCE_USERNAME || 'React';
   if (!SAUCE_USERNAME) {
     grunt.fatal('Requires the environment variable SAUCE_USERNAME to be set');
   }

From 0c366ce6484a5128d9fadbc3471438d86f375fbf Mon Sep 17 00:00:00 2001
From: Thomas Aylott <aylott@fb.com>
Date: Fri, 6 Dec 2013 15:46:14 -0500
Subject: [PATCH 13/15] fix lint

---
 grunt/config/complexity.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/grunt/config/complexity.js b/grunt/config/complexity.js
index 865c3653737c1..56a85cc191881 100644
--- a/grunt/config/complexity.js
+++ b/grunt/config/complexity.js
@@ -1,3 +1,4 @@
+"use strict";
 var grunt = require('grunt');
 
 module.exports.generic = {

From 55f50ca4d1561111c30f648dea1fa9551cb38a5c Mon Sep 17 00:00:00 2001
From: Thomas Aylott <aylott@fb.com>
Date: Fri, 6 Dec 2013 16:35:58 -0500
Subject: [PATCH 14/15] enable code coverage and code complexity reports

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

diff --git a/.travis.yml b/.travis.yml
index d996b85ed2ac4..5341c13dae5db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,8 @@ env:
   matrix:
   - TEST_TYPE=test:full
   - TEST_TYPE=lint
+  - TEST_TYPE="build complexity"
+  - TEST_TYPE=test:coverage
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie11
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie9
@@ -41,6 +43,8 @@ matrix:
   fast_finish: true
   allow_failures:
     - env: TEST_TYPE=lint
+    - env: TEST_TYPE="build complexity"
+    - env: TEST_TYPE=test:coverage
     - 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

From feeebfbc51962b0029e9d1b316187c6da0fbfed3 Mon Sep 17 00:00:00 2001
From: Thomas Aylott <aylott@fb.com>
Date: Mon, 9 Dec 2013 14:55:00 -0500
Subject: [PATCH 15/15] removed complexity report until it's fixed

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5341c13dae5db..5837cf9d7aea3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,6 @@ env:
   matrix:
   - TEST_TYPE=test:full
   - TEST_TYPE=lint
-  - TEST_TYPE="build complexity"
   - TEST_TYPE=test:coverage
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie11
   - TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
@@ -43,7 +42,6 @@ matrix:
   fast_finish: true
   allow_failures:
     - env: TEST_TYPE=lint
-    - env: TEST_TYPE="build complexity"
     - env: TEST_TYPE=test:coverage
     - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie11
     - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10