-
Notifications
You must be signed in to change notification settings - Fork 27.4k
chore(travis/build.sh): move ddescribe check before unit tests #13517
Conversation
@@ -12,6 +12,7 @@ if [ $JOB = "unit" ]; then | |||
BROWSERS="SL_Chrome,SL_Safari,SL_Firefox,SL_IE_9,SL_IE_10,SL_IE_11,SL_iOS" | |||
fi | |||
|
|||
grunt ddescribe-iit |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TBH, I would prefer running all ci-checks (except for jscs
) first and just run jscs
after the unit tests.
1e021b3
to
20227e2
Compare
I've created a new task that includes ddescribe-iit, jshint and merge-conflicts. jscs is run after the tests run. |
@@ -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-iit', 'jshint', 'merge-conflict']); | |||
grunt.registerTask('ci-checks', ['merge-conflict', 'jshint', 'jscs']); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was removing ddescribe-iit
from this task intended ?
20227e2
to
14b783b
Compare
Updated. Good catches! |
grunt test:promises-aplus | ||
grunt test:unit --browsers $BROWSERS --reporters dots | ||
grunt ci-checks | ||
grunt jcsc |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jcsc --> jscs (:smiley:)
LGTM (with typo fixed) 👍 |
14b783b
to
241ce8c
Compare
I think it would be even better if we create a new job on travis that only runs the ci-checks. |
Ok, sounds reasonable. The only downside I see is that it will increase the average build run time by a few minutes. |
Not necessarily as they are run in parallel - also the ci-checks wouldn't use up tunnels as it is not doing any karma or protractor |
If the ci-checks are failing it means that one of the following is happening:
So, I am not sure we gain much 😃 Just saying... |
The reason this is helpful is that when debugging it is helpful to send a commit with a ddescribe block to Travis to run just that block. But if the ddescribe test kills the build early you don't see if the test would have passed. |
When you are working on a fix, it's also nice to see at a glance if your tests failed, or if you just made a style error. |
04f019b
to
aadcf01
Compare
I've created a new sh file which contains all the logic for the before_script block. However, I am getting this error for all jobs:
The file isn't much different than the others. Aynone have an idea? |
aadcf01
to
eeb9b3b
Compare
Could it be that directory you are trying to create ? |
1344b85
to
b22f0f0
Compare
57f04c9
to
010eda8
Compare
The file was created witt the wrong permissions ... I've added the new job, PTAL |
I was going to suggest a bit of |
LGTM |
Previously, ddescribe, merge-conflicts, jshint, and jscs would run after unit & e2e tests ran. 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 always run. This was not guaraneteed; when Travis exits with a warning after some browsers have run, ddescribe doesn't get run and it doesn't become apparent that not all tests have run. Additionally, a separate job clearly separates style from test errors, which e.g. means you can open a PR that includes an iit to speed up the job, and see immediately if the test passes, because the ddescribe error is in another job.
010eda8
to
b716828
Compare
Merging but tweaking the error message here: https://github.com/angular/angular.js/pull/13517/files#diff-014afcca28a4c58f73f0c7973192510cR35 |
Landed as 0b94e8a Now checking that it works on 1.2, 1.3 and 1.4 |
Thanks @Narretz |
This was 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.