aboutsummaryrefslogtreecommitdiffstats
path: root/Gruntfile.js
diff options
context:
space:
mode:
authorJulie2014-01-30 22:09:09 -0800
committerIgor Minar2014-02-05 15:40:16 -0800
commit84467d869730c6821c07496f510355ab73e7c10b (patch)
tree726315b47d229fd92ba6dd5390dd12e117234826 /Gruntfile.js
parent0e85ca9ddb5f259908400463764fd6141977b341 (diff)
downloadangular.js-84467d869730c6821c07496f510355ab73e7c10b.tar.bz2
refactor(testing): run end to end tests on separate browsers in parallel
Diffstat (limited to 'Gruntfile.js')
-rw-r--r--Gruntfile.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 7f36395f..d9e58049 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -90,7 +90,7 @@ module.exports = function(grunt) {
},
- runprotractor: {
+ protractor: {
normal: 'protractor-conf.js',
jenkins: 'protractor-jenkins-conf.js'
},
@@ -291,8 +291,8 @@ module.exports = function(grunt) {
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: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:ci-protractor', 'Run the end to end tests with Protractor and keep a test server running in the background', ['webdriver', 'connect:testserver', 'runprotractor:jenkins']);
+ 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: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']);