chore(travis/build.sh): move ddescribe and jshint check before tests

Now, before the tests run, ddescribe and jshint will run. After the
tests, jscs will run. Merge conflicts should be caught by jshint, that's
why this task has been removed.

The order was orginally 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.

Author: Narretz

Gruntfile.js

@@ -355,6 +355,7 @@ module.exports = function(grunt) {
   grunt.registerTask('minify', ['bower','clean', 'build', 'minall']);
   grunt.registerTask('webserver', ['connect:devserver']);
   grunt.registerTask('package', ['bower','clean', 'buildall', 'minall', 'collect-errors', 'docs', 'copy', 'write', 'compress']);
-  grunt.registerTask('ci-checks', ['ddescribe-iit', 'merge-conflict', 'jshint', 'jscs']);
+  grunt.registerTask('ci-pre-checks', ['ddescribe', 'jshint']);
+  grunt.registerTask('ci-checks', ['merge-conflict', 'jshint', 'jscs']);
   grunt.registerTask('default', ['package']);
 };

scripts/travis/build.sh

@@ -12,9 +12,10 @@ if [ $JOB = "unit" ]; then
     BROWSERS="SL_Chrome,SL_Safari,SL_Firefox,SL_IE_9,SL_IE_10,SL_IE_11,SL_iOS"
   fi
 
+  grunt ci-pre-checks
   grunt test:promises-aplus
   grunt test:unit --browsers $BROWSERS --reporters dots
-  grunt ci-checks
+  grunt jcsc
   grunt tests:docs --browsers $BROWSERS --reporters dots
 elif [ $JOB = "docs-e2e" ]; then
   grunt test:travis-protractor --specs "docs/app/e2e/**/*.scenario.js"