aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2017-10-19 12:00:47 -0500
committerGitHub <noreply@github.com>2017-10-19 12:00:47 -0500
commitfce2494c8643ffab38ccbf0294eb90af85d16027 (patch)
tree9678bf5400e40c0f21ba53d5a2d36487b995b5b1 /.travis.yml
parentb7bf70982395ee5fd2e89064f87f268eeddb9d6d (diff)
parent734f98178261e2ba42df3ff6c39c8950e9eb01ed (diff)
downloadrails-fce2494c8643ffab38ccbf0294eb90af85d16027.tar.gz
rails-fce2494c8643ffab38ccbf0294eb90af85d16027.tar.bz2
rails-fce2494c8643ffab38ccbf0294eb90af85d16027.zip
Merge pull request #30930 from rails/replace-phantomjs-with-chrome
PhantomJS is abandoned, replace it with Selenium/Chrome headless
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 19164129c5..851365acbd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ services:
addons:
postgresql: "9.6"
+ chrome: stable
apt:
sources:
- sourceline: "ppa:mc3man/trusty-media"
@@ -34,7 +35,6 @@ before_install:
- "[[ $GEM != 'av:ujs' ]] || nvm install node"
- "[[ $GEM != 'av:ujs' ]] || node --version"
- "[[ $GEM != 'av:ujs' ]] || (cd actionview && npm install)"
- - "[[ $GEM != 'av:ujs' ]] || [[ $(phantomjs --version) > '2' ]] || npm install -g phantomjs-prebuilt"
before_script:
# Set Sauce Labs username and access key. Obfuscated, purposefully not encrypted.