File tree Expand file tree Collapse file tree 3 files changed +10
-8
lines changed Expand file tree Collapse file tree 3 files changed +10
-8
lines changed Original file line number Diff line number Diff line change @@ -6,14 +6,11 @@ node_js:
6
6
cache :
7
7
directories :
8
8
- node_modules/
9
- addons :
10
- firefox : ' 42.0'
11
9
install :
12
10
- npm set progress=false
13
11
- travis_retry npm install
14
12
before_script :
15
13
- npm install -g grunt-cli
16
- - ' export DISPLAY=:99.0'
17
- - ' sh -e /etc/init.d/xvfb start'
18
14
script :
15
+ - node_modules/grunt-protractor-runner/node_modules/.bin/webdriver-manager start &
19
16
- npm test
Original file line number Diff line number Diff line change 1
1
var config = {
2
- directConnect : true ,
3
2
baseUrl : 'http://localhost:8000/' ,
3
+ seleniumAddress : 'http://localhost:4444/wd/hub' ,
4
4
specs : [
5
5
'spec/*.spec.js'
6
6
] ,
@@ -16,9 +16,13 @@ var config = {
16
16
} ;
17
17
18
18
if ( process . env . TRAVIS ) {
19
- // Run FF on Travis
19
+ //Run PhantomJS on Travis
20
20
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
22
26
} ;
23
27
} else {
24
28
config . capabilities = {
Original file line number Diff line number Diff line change 17
17
"grunt-contrib-jshint" : " ~0.10.0" ,
18
18
"grunt-jasmine-node" : " ~0.2.1" ,
19
19
"grunt-protractor-runner" : " ^1.1.4" ,
20
- "protractor" : " 2.5.1"
20
+ "phantomjs" : " 2.1.3" ,
21
+ "protractor" : " ~1.5.0"
21
22
},
22
23
"repository" : {
23
24
"type" : " git" ,
You can’t perform that action at this time.
0 commit comments