aboutsummaryrefslogtreecommitdiffstats
path: root/Gruntfile.js
diff options
context:
space:
mode:
authorJulie2014-01-07 11:51:32 -0800
committerJeff Cross2014-01-09 17:21:46 -0800
commit2ed4ad55022f6e5519617a3797649fe1e68f3734 (patch)
tree0e7672b6e47701f076d6247202263e043a616b02 /Gruntfile.js
parent1d2a388830d95ae1a1f9b577fd0891a2e1f31bcd (diff)
downloadangular.js-2ed4ad55022f6e5519617a3797649fe1e68f3734.tar.bz2
feat(build): add a grunt test for running protractor tests extracted from the docs
Diffstat (limited to 'Gruntfile.js')
-rw-r--r--Gruntfile.js9
1 files changed, 8 insertions, 1 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 0127f2c4..203cc3be 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -101,6 +101,11 @@ module.exports = function(grunt) {
},
+ runprotractor: {
+ normal: 'protractor-conf.js'
+ },
+
+
clean: {
build: ['build'],
tmp: ['tmp']
@@ -283,13 +288,15 @@ 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:e2e']);
+ grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['jshint', 'package','test:unit','test:promises-aplus', 'tests:docs', 'test:e2e', 'webdriver', 'runprotractor:normal']);
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:unit', 'Run unit, jQuery and Karma module tests with Karma', ['tests:jqlite', 'tests:jquery', 'tests:modules']);
grunt.registerTask('test:e2e', 'Run the end to end tests with Karma and keep a test server running in the background', ['connect:testserver', 'tests:end2end']);
+ // This should eventually replace test:e2e
+ grunt.registerTask('test:protractor', 'Run the end to end tests with Protractor and keep a test server running in the background', ['webdriver', 'connect:testserver', 'runprotractor:normal']);
grunt.registerTask('test:docgen', ['jasmine_node']);
grunt.registerTask('test:promises-aplus',['build:promises-aplus-adapter','shell:promises-aplus-tests']);