diff options
| author | Vojta Jina | 2013-08-20 14:43:15 -0700 |
|---|---|---|
| committer | Vojta Jina | 2013-08-23 16:49:10 -0700 |
| commit | 7909ebedc2a098f041dd2d3835e7297392bfdb7d (patch) | |
| tree | 92d16a01e9df2d437bbfc79ccc38099936833fbe /Gruntfile.js | |
| parent | 1d06a943857719ef533ca374c05aa5e02089a4d9 (diff) | |
| download | angular.js-7909ebedc2a098f041dd2d3835e7297392bfdb7d.tar.bz2 | |
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
Diffstat (limited to 'Gruntfile.js')
| -rw-r--r-- | Gruntfile.js | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index daf5f24e..625ab7a3 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -27,16 +27,9 @@ module.exports = function(grunt) { parallel: { travis: { - options: { - stream: true - }, tasks: [ - {grunt: true, args: ['test:docgen']}, - util.parallelTask('tests:docs'), - util.parallelTask('tests:modules'), - util.parallelTask('tests:jquery'), - util.parallelTask('tests:jqlite'), - util.parallelTask('test:e2e') + util.parallelTask(['test:unit', 'test:docgen', 'tests:docs'], {stream: true}), + util.parallelTask(['test:e2e']) ] } }, |
