summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml4
-rw-r--r--js/config/protractor.js5
2 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 6bce4a04a..105bdf3c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,13 +49,11 @@ script:
- cd js/
- npm install --deps # npm install needs to run before sudo npm install because otherwise it fails because a tmp file exists in the home dir
- sudo npm -g install grunt-cli protractor
- - sudo webdriver-manager update --standalone
+ - webdriver-manager update
- npm test
- sudo chown -R www-data:www-data ../../../data
- sudo chown -R www-data:www-data ../../../config
- grunt e2e --verbose
- - webdriver-manager update
- - grunt e2e --verbose
addons:
postgresql: "9.3"
diff --git a/js/config/protractor.js b/js/config/protractor.js
index 313505476..e1ed3d14d 100644
--- a/js/config/protractor.js
+++ b/js/config/protractor.js
@@ -26,5 +26,10 @@ exports.config = {
});
});
},
+ capabilities: {
+ browserName: 'phantomjs',
+ version: '',
+ platform: 'ANY'
+ },
baseUrl: baseUrl
}; \ No newline at end of file