diff options
| author | Peter Bacon Darwin | 2014-02-12 22:47:42 +0000 | 
|---|---|---|
| committer | Peter Bacon Darwin | 2014-02-16 19:03:41 +0000 | 
| commit | 389d4879da4aa620ee95d789b19ff9be44eb730a (patch) | |
| tree | 93352ddc8738a975904a1774d51b93d585ca1075 /Gruntfile.js | |
| parent | a564160511bf1bbed5a4fe5d2981fae1bb664eca (diff) | |
| download | angular.js-389d4879da4aa620ee95d789b19ff9be44eb730a.tar.bz2 | |
chore(doc-gen): new docs
chore(doc-gen): implement dgeni
Diffstat (limited to 'Gruntfile.js')
| -rw-r--r-- | Gruntfile.js | 17 | 
1 files changed, 8 insertions, 9 deletions
| diff --git a/Gruntfile.js b/Gruntfile.js index 89e461d6..74ddd1eb 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -23,7 +23,7 @@ module.exports = function(grunt) {      parallel: {        travis: {          tasks: [ -          util.parallelTask(['test:unit', 'test:docgen', 'test:promises-aplus', 'tests:docs'], {stream: true}), +          util.parallelTask(['test:unit', 'test:promises-aplus'/*, 'tests:docs'*/], {stream: true}),            util.parallelTask(['test:e2e'])          ]        } @@ -77,7 +77,7 @@ module.exports = function(grunt) {      tests: {        jqlite: 'karma-jqlite.conf.js',        jquery: 'karma-jquery.conf.js', -      docs: 'karma-docs.conf.js', +      //docs: 'karma-docs.conf.js',        modules: 'karma-modules.conf.js'      }, @@ -86,7 +86,7 @@ module.exports = function(grunt) {        jqlite: 'karma-jqlite.conf.js',        jquery: 'karma-jquery.conf.js',        modules: 'karma-modules.conf.js', -      docs: 'karma-docs.conf.js' +      //docs: 'karma-docs.conf.js'      }, @@ -217,9 +217,9 @@ module.exports = function(grunt) {      }, -    docs: { -      process: ['build/docs/*.html', 'build/docs/.htaccess'] -    }, +    // docs: { +    //   process: ['build/docs/*.html', 'build/docs/.htaccess'] +    // },      "jasmine_node": {        projectRoot: 'docs/spec' @@ -286,17 +286,16 @@ module.exports = function(grunt) {    //alias tasks -  grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['jshint', 'package','test:unit','test:promises-aplus', 'tests:docs', 'test:protractor']); +  grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['jshint', 'package','test:unit','test:promises-aplus'/*, 'tests:docs'*/, 'test:protractor']);    grunt.registerTask('test:jqlite', 'Run the unit tests with Karma' , ['tests:jqlite']);    grunt.registerTask('test:jquery', 'Run the jQuery unit tests with Karma', ['tests:jquery']);    grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', ['tests:modules']); -  grunt.registerTask('test:docs', 'Run the doc-page tests with Karma', ['package', 'tests:docs']); +  grunt.registerTask('test:docs', 'Run the doc-page tests with Karma', ['package'/*, 'tests:docs'*/]);    grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['tests:jqlite', 'tests:jquery', 'tests:modules']);    grunt.registerTask('test:protractor', 'Run the end to end tests with Protractor and keep a test server running in the background', ['webdriver', 'connect:testserver', 'protractor:normal']);    grunt.registerTask('test:jq-protractor', 'Run the end to end tests against jquery with Protractor and keep a test server running in the background', ['webdriver', 'connect:testserver', 'protractor:jquery']);    grunt.registerTask('test:ci-protractor', 'Run the end to end tests with Protractor and keep a test server running in the background', ['webdriver', 'connect:testserver', 'protractor:jenkins']);    grunt.registerTask('test:e2e', 'Alias for test:protractor', ['test:protractor']); -  grunt.registerTask('test:docgen', ['jasmine_node']);    grunt.registerTask('test:promises-aplus',['build:promises-aplus-adapter','shell:promises-aplus-tests']);    grunt.registerTask('minify', ['bower','clean', 'build', 'minall']); | 
