diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-23 17:55:30 +0200 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-23 17:55:30 +0200 |
| commit | 6208debf043fc8af28de13515dec4d10ace99bc3 (patch) | |
| tree | 3d1cfc3a94b622f5fc7c65fac0a8f9fb8aadfb37 /js/Gruntfile.js | |
| parent | 4fa9c6d6cfc24b848bc8bb1526ef8ef50f046cb3 (diff) | |
use firefox for ci and e2e
Diffstat (limited to 'js/Gruntfile.js')
| -rw-r--r-- | js/Gruntfile.js | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/js/Gruntfile.js b/js/Gruntfile.js index 58764d823..03a0c607c 100644 --- a/js/Gruntfile.js +++ b/js/Gruntfile.js @@ -150,16 +150,11 @@ module.exports = function (grunt) { } }, protractor: { - phantomjs: { + firefox: { options: { - configFile: 'protractor.phantomjs.conf.js' + configFile: 'protractor.conf.js' } }, - chrome: { - options: { - configFile: 'protractor.chrome.conf.js' - } - } }, connect: { server: { @@ -175,7 +170,7 @@ module.exports = function (grunt) { grunt.registerTask('dev', ['watch:concat']); grunt.registerTask('test', ['karma:unit']); grunt.registerTask('php', ['watch:phpunit']); - grunt.registerTask('e2e', ['protractor_webdriver', 'connect', 'protractor:chrome']); + grunt.registerTask('e2e', ['protractor_webdriver', 'connect', 'protractor']); grunt.registerTask('ci-unit', ['default', 'karma:continuous']); - grunt.registerTask('ci-e2e', ['protractor_webdriver', 'connect', 'protractor:phantomjs']); + grunt.registerTask('ci-e2e', ['protractor_webdriver', 'connect', 'protractor']); };
\ No newline at end of file |