diff options
| author | Julie | 2014-02-19 21:01:54 -0800 |
|---|---|---|
| committer | Julie | 2014-02-21 16:57:04 -0800 |
| commit | 39c82f3fb7a8459304d5e07dc87bd0623ad1efd0 (patch) | |
| tree | cff2cb48fa3199d40ab292cca9ddf5ee4ef5505e /Gruntfile.js | |
| parent | 1293cc88cd3d2e72c55fa8b8d268fab246e79fed (diff) | |
| download | angular.js-39c82f3fb7a8459304d5e07dc87bd0623ad1efd0.tar.bz2 | |
chore(travis): reorganize protractor configs to group by spec instead of by browser
Use the multiConfiguration ability of Protractor to start tests on multiple browsers
from the same travis cell. Group tests by type (jquery, jqlite, or docs tests) instead
of by browser. Turn on tests for jQuery.
Diffstat (limited to 'Gruntfile.js')
| -rw-r--r-- | Gruntfile.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 74ddd1eb..a5a611ec 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -92,7 +92,7 @@ module.exports = function(grunt) { protractor: { normal: 'protractor-conf.js', - jquery: 'protractor-jquery-conf.js', + travis: 'protractor-travis-conf.js', jenkins: 'protractor-jenkins-conf.js' }, @@ -293,8 +293,8 @@ module.exports = function(grunt) { 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:travis-protractor', 'Run the end to end tests with Protractor for Travis CI builds', ['connect:testserver', 'protractor:travis']); + grunt.registerTask('test:ci-protractor', 'Run the end to end tests with Protractor for Jenkins CI builds', ['webdriver', 'connect:testserver', 'protractor:jenkins']); grunt.registerTask('test:e2e', 'Alias for test:protractor', ['test:protractor']); grunt.registerTask('test:promises-aplus',['build:promises-aplus-adapter','shell:promises-aplus-tests']); |