diff options
| author | Vojta Jina | 2013-12-16 13:37:09 -0800 |
|---|---|---|
| committer | Vojta Jina | 2013-12-16 13:37:09 -0800 |
| commit | d5c5e2b5848dcb312390549a92c94c76822a5f4f (patch) | |
| tree | 5143cbcbf8ea5369958e68dfcfa17fe2b484ffc5 | |
| parent | cbb3ce2c309052b951d0cc87e4c6daa9c48a3dd8 (diff) | |
| download | angular.js-d5c5e2b5848dcb312390549a92c94c76822a5f4f.tar.bz2 | |
chore: run docs unit test only once
Before we would run them twice on Travis. I don't think it should be part of ci-check task.
| -rw-r--r-- | Gruntfile.js | 2 | ||||
| -rwxr-xr-x | jenkins_build.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index a3b4e97b..0127f2c4 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -297,6 +297,6 @@ module.exports = function(grunt) { grunt.registerTask('webserver', ['connect:devserver']); grunt.registerTask('package', ['bower','clean', 'buildall', 'minall', 'collect-errors', 'docs', 'copy', 'write', 'compress']); grunt.registerTask('package-without-bower', ['clean', 'buildall', 'minall', 'collect-errors', 'docs', 'copy', 'write', 'compress']); - grunt.registerTask('ci-checks', ['ddescribe-iit', 'merge-conflict', 'jshint', 'test:docgen']); + grunt.registerTask('ci-checks', ['ddescribe-iit', 'merge-conflict', 'jshint']); grunt.registerTask('default', ['package']); }; diff --git a/jenkins_build.sh b/jenkins_build.sh index 68013721..d4f66c11 100755 --- a/jenkins_build.sh +++ b/jenkins_build.sh @@ -28,11 +28,12 @@ rm -f angular.js.size npm install --color false grunt ci-checks package --no-color +# DOCS generator unit tests # +grunt test:docgen --no-color # UNIT TESTS # grunt test:unit --browsers $BROWSERS --reporters=dots,junit --no-colors --no-color - # END TO END TESTS # grunt test:e2e --browsers $BROWSERS_E2E --reporters=dots,junit --no-colors --no-color |