diff options
| author | Julie | 2014-01-30 18:49:58 -0800 |
|---|---|---|
| committer | Igor Minar | 2014-02-05 15:39:59 -0800 |
| commit | 0e85ca9ddb5f259908400463764fd6141977b341 (patch) | |
| tree | 88f0a17d6e1830a75c4c80451e7a84e559c95b2f /Gruntfile.js | |
| parent | e7face4728d3aed6dc089966d489d0c93b65913d (diff) | |
| download | angular.js-0e85ca9ddb5f259908400463764fd6141977b341.tar.bz2 | |
chore(testing): run end to end tests on firefox and safari as well as chrome
Update the Travis and Jenkins configs to run protractor tests on Safari and Firefox as well,
and make the Travis tests run output XML and turn off color.
Fix tests which were failing in Firefox due to clear() not working as expected.
Fix tests which were failing in Safari due to SafariDriver not understanding the minus key,
and disable tests which SafariDriver has no support for.
Diffstat (limited to 'Gruntfile.js')
| -rw-r--r-- | Gruntfile.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index ff4db327..7f36395f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -91,7 +91,8 @@ module.exports = function(grunt) { runprotractor: { - normal: 'protractor-conf.js' + normal: 'protractor-conf.js', + jenkins: 'protractor-jenkins-conf.js' }, @@ -291,6 +292,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', '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: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']); |