Skip to content

John McEleney / casperjs

Go to a project
Toggle navigation
Toggle navigation pinning
Commit df246637 df2466375418e08dfcc51bde00ae790852b9905a by Nicolas Perriault
Options

Revert "added checks for PhantomJS version; updated travis build config" 

This reverts commit 4c4fb34b.

Erroneous branch, pushing releases while drinking wine is not probably not a good idea.
1 parent 4c4fb34b
Inline Side-by-side
Showing 2 changed files with 9 additions and 4 deletions
...@@ -10,10 +10,17 @@ before_install: ...@@ -10,10 +10,17 @@ before_install:
10 - sudo mv phantomjs-1.8.2-linux-x86_64/bin/phantomjs bin/phantomjs182 10 - sudo mv phantomjs-1.8.2-linux-x86_64/bin/phantomjs bin/phantomjs182
11 - ls -la bin/phantomjs182 11 - ls -la bin/phantomjs182
12 - bin/phantomjs182 --version 12 - bin/phantomjs182 --version
13 - echo "installing PhantomJS 1.9.0"
14 - wget http://phantomjs.googlecode.com/files/phantomjs-1.9.0-linux-x86_64.tar.bz2
15 - tar -xvf phantomjs-1.9.0-linux-x86_64.tar.bz2
16 - sudo mv phantomjs-1.9.0-linux-x86_64/bin/phantomjs bin/phantomjs190
17 - bin/phantomjs190 --version
18 - ls -la bin/phantomjs190
13 19
14 before_script: 20 before_script:
15 - "npm install -g jshint@2.0.1" 21 - "npm install -g jshint@2.0.1"
16 - bin/phantomjs182 --version 22 - bin/phantomjs182 --version
23 - bin/phantomjs190 --version
17 24
18 script: 25 script:
19 - make test 26 - make test
...@@ -21,6 +28,7 @@ script: ...@@ -21,6 +28,7 @@ script:
21 env: 28 env:
22 matrix: 29 matrix:
23 - PHANTOMJS_EXECUTABLE="bin/phantomjs182 --local-to-remote-url-access=yes --ignore-ssl-errors=yes" 30 - PHANTOMJS_EXECUTABLE="bin/phantomjs182 --local-to-remote-url-access=yes --ignore-ssl-errors=yes"
31 - PHANTOMJS_EXECUTABLE="bin/phantomjs190 --local-to-remote-url-access=yes --ignore-ssl-errors=yes"
24 32
25 notifications: 33 notifications:
26 irc: 34 irc:
......
...@@ -37,12 +37,9 @@ if ('process' in this && process.title === "node") { ...@@ -37,12 +37,9 @@ if ('process' in this && process.title === "node") {
37 process.exit(1); 37 process.exit(1);
38 } 38 }
39 39
40 // phantom checks 40 // phantom check
41 if (!('phantom' in this)) { 41 if (!('phantom' in this)) {
42 console.error('CasperJS needs to be executed in a PhantomJS environment http://phantomjs.org/'); 42 console.error('CasperJS needs to be executed in a PhantomJS environment http://phantomjs.org/');
43 } else if (phantom.version.major >= 1 && phantom.version.minor >= 9) {
44 console.error('CasperJS 1.0.x does not support PhantomJS version >= 1.9');
45 phantom.exit();
46 } 43 }
47 44
48 // Common polyfills 45 // Common polyfills
......