diff options
| author | Julie | 2014-02-06 11:29:24 -0800 |
|---|---|---|
| committer | Igor Minar | 2014-02-07 20:41:39 -0800 |
| commit | e645f7cae14618bd8fc7d6b3eadf9307f5a1aeb7 (patch) | |
| tree | 8b29f6602f45e83becac49e1311ad05ac15d052e /Gruntfile.js | |
| parent | ad275b226551e45b68dace46af5fcd8178e31a60 (diff) | |
| download | angular.js-e645f7cae14618bd8fc7d6b3eadf9307f5a1aeb7.tar.bz2 | |
refactor(testing): split travis end to end tests into separate jobs for jquery and jqlite
Closes #6159
Diffstat (limited to 'Gruntfile.js')
| -rw-r--r-- | Gruntfile.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 123a0d72..89e461d6 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -92,6 +92,7 @@ module.exports = function(grunt) { protractor: { normal: 'protractor-conf.js', + jquery: 'protractor-jquery-conf.js', jenkins: 'protractor-jenkins-conf.js' }, @@ -292,6 +293,7 @@ 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:e2e', 'Alias for test:protractor', ['test:protractor']); grunt.registerTask('test:docgen', ['jasmine_node']); |
