Skip to content

Commit

Permalink
refs #8143 install phantomjs2.0 for UI tests
Browse files Browse the repository at this point in the history
  • Loading branch information
tsteur committed Jun 22, 2015
1 parent adeddd0 commit 5020dcf
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@ before_script:

# Make sure we use Python 2.6
- ./tests/travis/install_python_2.6.sh
- ./tests/travis/install_phantomjs_2.0.sh
- export PATH=$PWD/travis-phantomjs:$PATH > /dev/null
# - PATH cannot be updated in a subprocess, it would be ignored

- ./tests/travis/prepare.sh
- ./tests/travis/setup_webserver.sh
Expand Down
3 changes: 3 additions & 0 deletions plugins/TestRunner/templates/travis.yml.twig
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ before_script:

# Make sure we use Python 2.6
- ./tests/travis/install_python_2.6.sh
- ./tests/travis/install_phantomjs_2.0.sh
- export PATH=$PWD/travis-phantomjs:$PATH > /dev/null
# - PATH cannot be updated in a subprocess, it would be ignored

- ./tests/travis/prepare.sh
- ./tests/travis/setup_webserver.sh
Expand Down
2 changes: 2 additions & 0 deletions tests/lib/screenshot-testing/run-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ if (config.phpServer.REQUEST_URI.slice(-1) != '/') {
config.phpServer.REQUEST_URI += '/';
}

console.log('PhantomJS version: ' + phantom.version.major + '.' + phantom.version.minor + '.' + phantom.version.patch);

require('./support/fs-extras');

phantom.injectJs('./support/globals.js');
Expand Down
8 changes: 8 additions & 0 deletions tests/travis/install_phantomjs_2.0.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/usr/bin/env bash
if [ "$TEST_SUITE" = "UITests" ];
then
# See https://github.com/travis-ci/travis-ci/issues/3225
mkdir travis-phantomjs > /dev/null
wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 > /dev/null
tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs > /dev/null
fi

0 comments on commit 5020dcf

Please sign in to comment.