Skip to content

Commit 672396d

Browse files
committed
Use phantomJS 2.1.1 in travis
no issue - download phantomjs 2.1.1 in Travis' `before_install` step and update the `PATH` export to so the downloaded version is used - remove the now no-longer needed `ember-cli-es5-shim` dependency - update documentation references to match new phantomjs version
1 parent 851a3aa commit 672396d

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ matrix:
2828
- node_js: "0.10"
2929
env: TEST_SUITE=lint
3030
before_install:
31+
# - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
32+
- mkdir travis-phantomjs
33+
- wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
34+
- tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
35+
- export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
3136
- if [ $DB == "mysql" ]; then mysql -e 'create database ghost_testing'; fi
3237
- if [ $DB == "pg" ]; then psql -c 'create database ghost_testing;' -U postgres; fi
3338
before_script:

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ requests](#pull-requests), but please respect the following restrictions:
4545
* Please **search for existing issues**. Help us keep duplicate issues to a minimum by checking to see if someone
4646
has already reported your problem or requested your idea.
4747

48-
* Please **do not** use the issue tracker for personal support requests (use [slack](http://ghost.org/slack) or
48+
* Please **do not** use the issue tracker for personal support requests (use [slack](http://ghost.org/slack) or
4949
[stackoverflow](http://stackoverflow.com/questions/tagged/ghost-blog) if you prefer).
5050

5151
* Please **do not** derail or troll issues. Keep the discussion on topic and respect the opinions of others.
@@ -194,7 +194,7 @@ Looking to get setup to work on Ghost? AWESOME! The [Ghost-Vagrant](https://gith
194194
**What you'll need:**
195195

196196
- Node version 0.10.x & npm
197-
- phantomjs 1.9.x
197+
- phantomjs 2.1.x
198198
([instructions](https://github.com/TryGhost/Ghost/wiki/Functional-testing-with-PhantomJS-and-CasperJS)) for running tests
199199

200200

core/client/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"ember-cli-babel": "5.1.5",
2727
"ember-cli-content-security-policy": "0.4.0",
2828
"ember-cli-dependency-checker": "1.1.0",
29-
"ember-cli-es5-shim": "0.1.1",
3029
"ember-cli-fastclick": "1.0.3",
3130
"ember-cli-htmlbars": "1.0.1",
3231
"ember-cli-htmlbars-inline-precompile": "0.3.1",

0 commit comments

Comments
 (0)