Skip to content

Commit 5f32e69

Browse files
committed
chore(travis/build.sh): move ddescribe check before unit tests
This was changed as part of angular#9792. While the logic is sound that style errors shouldn't block tests from running, ddescribe should run before the tests. Otherwise, when Travis exits with a warning after some browsers have run, ddescribe doesn't get run and it doesn't immediately become apparent that not all tests have run.
1 parent e4e5677 commit 5f32e69

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Gruntfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,6 @@ module.exports = function(grunt) {
355355
grunt.registerTask('minify', ['bower','clean', 'build', 'minall']);
356356
grunt.registerTask('webserver', ['connect:devserver']);
357357
grunt.registerTask('package', ['bower','clean', 'buildall', 'minall', 'collect-errors', 'docs', 'copy', 'write', 'compress']);
358-
grunt.registerTask('ci-checks', ['ddescribe-iit', 'merge-conflict', 'jshint', 'jscs']);
358+
grunt.registerTask('ci-checks', ['merge-conflict', 'jshint', 'jscs']);
359359
grunt.registerTask('default', ['package']);
360360
};

scripts/travis/build.sh

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ if [ $JOB = "unit" ]; then
1212
BROWSERS="SL_Chrome,SL_Safari,SL_Firefox,SL_IE_9,SL_IE_10,SL_IE_11,SL_iOS"
1313
fi
1414

15+
grunt ddescribe-iit
1516
grunt test:promises-aplus
1617
grunt test:unit --browsers $BROWSERS --reporters dots
1718
grunt ci-checks

0 commit comments

Comments
 (0)