Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 14b783b

Browse files
committed
chore(travis/build.sh): run ddescribe, merge-conflicts & jshint before tests
Now, before the tests run, ddescribe, merge-conflicts, and jshint will run. After the tests, jscs will run. The order was orginally changed as part of #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 14b783b

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

Gruntfile.js

+1
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ 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-pre-checks', ['ddescribe-iit', 'merge-conflict', 'jshint']);
358359
grunt.registerTask('ci-checks', ['ddescribe-iit', 'merge-conflict', 'jshint', 'jscs']);
359360
grunt.registerTask('default', ['package']);
360361
};

scripts/travis/build.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ 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 ci-pre-checks
1516
grunt test:promises-aplus
1617
grunt test:unit --browsers $BROWSERS --reporters dots
17-
grunt ci-checks
18+
grunt jcsc
1819
grunt tests:docs --browsers $BROWSERS --reporters dots
1920
elif [ $JOB = "docs-e2e" ]; then
2021
grunt test:travis-protractor --specs "docs/app/e2e/**/*.scenario.js"

0 commit comments

Comments
 (0)