Merge pull request #16 from the-grid/phantomjs-prebuilt

Travis: Use Phantomjs from NPM
flowhub · Aug 29, 2016 · 33d15a8 · 33d15a8
2 parents aab4c71 + f765dde
commit 33d15a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,11 +3,8 @@ node_js:
 - '4.2'
 before_script:
 - npm install -g grunt-cli
-- wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
-- tar -xjf phantomjs-2.0.0-ubuntu-12.04.tar.bz2
-- export PATH=./:$PATH
-- which phantomjs
-- export JSJOB_BROWSER=`which phantomjs`
+- export JSJOB_BROWSER=`node -e "console.log(require('phantomjs-prebuilt').path)"`
+- echo Using PhanthomJS at $JSJOB_BROWSER
 sudo: false
 deploy:
   provider: npm

diff --git a/package.json b/package.json
@@ -36,6 +36,7 @@
     "grunt-gh-pages": "^1.0.0",
     "grunt-mocha-test": "^0.12.7",
     "mocha": "^2.4.5",
+    "phantomjs-prebuilt": "^2.1.12",
     "webpack": "^1.12.14"
   },
   "dependencies": {