Skip to content

Commit 7aa7c3e

Browse files
committed
remove phantom dep and switch to electron
1 parent 6afb29a commit 7aa7c3e

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

.travis.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@ language: node_js
33
node_js:
44
- '0.10'
55
- '0.12'
6-
# https://mediocre.com/forum/topics/phantomjs-2-and-travis-ci-we-beat-our-heads-against-a-wall-so-you-dont-have-to
7-
# we alter PATH to use PWD first to avoid the use of sudo
86
before_install:
9-
- wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
10-
- tar -xjf phantomjs-2.0.0-ubuntu-12.04.tar.bz2
11-
- export PATH=$PWD:$PATH
7+
- 'export DISPLAY=:99.0'
8+
- 'sh -e /etc/init.d/xvfb start'
129
script: npm run ci
1310
# whenever a tag is pushed, we deploy to github releases
1411
before_deploy: npm run release

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"chrome-sync-fs": "git://github.com/2fast2fourier/chrome-sync-fs#sync-fs",
3838
"css-loader": "^0.9.1",
3939
"del": "^1.1.1",
40+
"electron-prebuilt": "^0.29.2",
4041
"eslint": "^0.24.0",
4142
"eslint-plugin-react": "^2.6.3",
4243
"expect": "git://github.com/phated/expect",
@@ -47,15 +48,14 @@
4748
"json-loader": "^0.5.1",
4849
"level-js": "^2.1.6",
4950
"mocha": "^2.2.1",
50-
"phantomjs": "git://github.com/phated/phantomjs",
5151
"style-loader": "^0.8.3",
5252
"webpack": "^1.7.2",
5353
"webpack-dev-server": "^1.7.0",
54-
"zuul": "^2.1.1"
54+
"zuul": "^3.2.0"
5555
},
5656
"scripts": {
5757
"test": "zuul test/*.js --local --open",
58-
"ci": "zuul test/*.js --phantom",
58+
"ci": "zuul test/*.js --electron",
5959
"build": "gulp",
6060
"release": "gulp gh-release",
6161
"postinstall": "gulp postinstall",

0 commit comments

Comments
 (0)