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] 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 b73c02a8ee..8a7cabe53d 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 b81bb33c03..bd44eb7083 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',