diff --git a/.travis.yml b/.travis.yml index 909cdb12..9c63a5a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,13 @@ -# Need to stay on precise until Travis fixes their MySQL problems -# See: https://github.com/travis-ci/travis-ci/issues/8331 -dist: precise -sudo: false +dist: trusty +sudo: required +addons: + apt: + packages: + - google-chrome-beta cache: bundler language: ruby rvm: - - 2.3.1 + - 2.5 env: matrix: - SOLIDUS_BRANCH=v1.1 DB=postgres diff --git a/Gemfile b/Gemfile index 6aebe20d..afcc0000 100644 --- a/Gemfile +++ b/Gemfile @@ -9,6 +9,8 @@ else gem "rails_test_params_backport", group: :test end +gem 'chromedriver-helper' if ENV['CI'] + gem 'pg', '~> 0.21' gem 'sqlite3' gem 'mysql2' diff --git a/solidus_i18n.gemspec b/solidus_i18n.gemspec index a92818d6..c2f9175b 100644 --- a/solidus_i18n.gemspec +++ b/solidus_i18n.gemspec @@ -32,11 +32,12 @@ Gem::Specification.new do |s| s.add_runtime_dependency 'deface', '~> 1.0' s.add_development_dependency 'byebug' - s.add_development_dependency 'capybara', '~> 2.4.4' + s.add_development_dependency 'capybara', '~> 2.17' + s.add_development_dependency 'selenium-webdriver', '~> 3.9' s.add_development_dependency 'database_cleaner', '~> 1.3' s.add_development_dependency 'factory_bot', '~> 4.5' s.add_development_dependency 'ffaker', '>= 1.25.0' - s.add_development_dependency 'poltergeist', '~> 1.5' + s.add_development_dependency 'poltergeist', '~> 1.17' s.add_development_dependency 'pry-rails', '>= 0.3.0' s.add_development_dependency 'rubocop', '>= 0.24.1' s.add_development_dependency 'rspec-rails', '~> 3.1' diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index 97dee6d9..c15f5d9c 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -1,11 +1,6 @@ require 'capybara/rspec' require 'capybara/rails' require 'capybara/poltergeist' +require 'selenium/webdriver' -RSpec.configure do - Capybara.javascript_driver = :poltergeist - - Capybara.register_driver(:poltergeist) do |app| - Capybara::Poltergeist::Driver.new app, timeout: 90 - end -end +Capybara.javascript_driver = :selenium_chrome_headless