From 8847b0759e57dfc9d1a540ce27df6aeec4cccc9d Mon Sep 17 00:00:00 2001
From: Andy Joslin <andytjoslin@gmail.com>
Date: Fri, 21 Feb 2014 11:46:04 -0500
Subject: [PATCH] chore(travis): merge cloudtest into one task

---
 Gruntfile.js         | 10 +++++++++-
 scripts/travis/ci.sh |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 4f299d5a41..3210ccef43 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -228,6 +228,14 @@ module.exports = function(grunt) {
     'concat:bundlemin'
   ]);
 
+  grunt.registerTask('cloudtest', [
+    'sauce-connect',
+    'karma:sauce',
+    'connect', 
+    'exec:e2e-sauce',
+    'sauce-disconnect'
+  ]);
+
   grunt.registerMultiTask('karma', 'Run karma', function() {
     var done = this.async();
     var options = this.options();
@@ -269,7 +277,7 @@ module.exports = function(grunt) {
       username: process.env.SAUCE_USER,
       accessKey: process.env.SAUCE_KEY,
       verbose: true,
-      tunnelIdentifier: process.env.TRAVIS_BUILD_NUMBER,
+      tunnelIdentifier: process.env.TRAVIS_BUILD_NUMBER
     }, function(err, instance) {
       if (err) {
         grunt.fail.fatal('Failed to launch sauce connect!', err);
diff --git a/scripts/travis/ci.sh b/scripts/travis/ci.sh
index 837b8587f0..e99b31321f 100755
--- a/scripts/travis/ci.sh
+++ b/scripts/travis/ci.sh
@@ -85,7 +85,7 @@ function run {
   echo ""
 
   # Do sauce unit tests and e2e tests with all browsers (takes longer)
-  grunt sauce-connect karma:sauce --reporters=dots exec:e2e-sauce sauce-disconnect
+  grunt cloudtest
 
   echo ""
   echo "--- Build and tests complete! ---"