Skip to content

Commit e7a770b

Browse files
author
Bogdan Livadariu
committed
run functional tests against phantomJS on travis since FF is not working as it should
1 parent 6490399 commit e7a770b

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@ node_js:
66
cache:
77
directories:
88
- node_modules/
9-
addons:
10-
firefox: '42.0'
119
install:
1210
- npm set progress=false
1311
- travis_retry npm install
1412
before_script:
1513
- npm install -g grunt-cli
16-
- 'export DISPLAY=:99.0'
17-
- 'sh -e /etc/init.d/xvfb start'
1814
script:
15+
- node_modules/grunt-protractor-runner/node_modules/.bin/webdriver-manager start &
1916
- npm test

example/protractor-conf.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var config = {
2-
directConnect: true,
32
baseUrl: 'http://localhost:8000/',
3+
seleniumAddress: 'http://localhost:4444/wd/hub',
44
specs: [
55
'spec/*.spec.js'
66
],
@@ -16,9 +16,13 @@ var config = {
1616
};
1717

1818
if (process.env.TRAVIS) {
19-
// Run FF on Travis
19+
//Run PhantomJS on Travis
2020
config.capabilities = {
21-
browserName: 'firefox'
21+
browserName: 'phantomjs',
22+
'phantomjs.binary.path': require('phantomjs').path,
23+
'phantomjs.ghostdriver.cli.args': ['--loglevel=DEBUG'],
24+
shardTestFiles: true,
25+
maxInstances: 2
2226
};
2327
} else {
2428
config.capabilities = {

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"grunt-contrib-jshint": "~0.10.0",
1818
"grunt-jasmine-node": "~0.2.1",
1919
"grunt-protractor-runner": "^1.1.4",
20-
"protractor": "2.5.1"
20+
"phantomjs": "2.1.3",
21+
"protractor": "~1.5.0"
2122
},
2223
"repository": {
2324
"type": "git",

0 commit comments

Comments
 (0)