From 7909ebedc2a098f041dd2d3835e7297392bfdb7d Mon Sep 17 00:00:00 2001
From: Vojta Jina
Date: Tue, 20 Aug 2013 14:43:15 -0700
Subject: chore: run more browsers on Travis (IE8,IE9,IE10,Safari,FF)

Also instead of running everything in parallel, there are only two parallel tasks:
- e2e tests running in the background (only on Chrome)
- all the unit tests running sequentially
---
 lib/grunt/utils.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/grunt/utils.js b/lib/grunt/utils.js
index 97e7c416..ed61a181 100644
--- a/lib/grunt/utils.js
+++ b/lib/grunt/utils.js
@@ -246,10 +246,18 @@ module.exports = {
     };
   },
 
-  parallelTask: function(name) {
-    var args = [name, '--port=' + this.lastParallelTaskPort];
+  parallelTask: function(args, options) {
+    var task = {
+      grunt: true,
+      args: args,
+      stream: options && options.stream
+    };
+
+    args.push('--port=' + this.lastParallelTaskPort);
 
-    if (grunt.option('browsers')) {
+    if (args.indexOf('test:e2e') !== -1 && grunt.option('e2e-browsers')) {
+      args.push('--browsers=' + grunt.option('e2e-browsers'));
+    } else if (grunt.option('browsers')) {
       args.push('--browsers=' + grunt.option('browsers'));
     }
 
@@ -259,8 +267,7 @@ module.exports = {
 
     this.lastParallelTaskPort++;
 
-
-    return {grunt: true, args: args};
+    return task;
   },
 
   lastParallelTaskPort: 9876
-- 
cgit v1.2.3