diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2019-12-05 02:36:20 +0300 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2019-12-05 02:36:54 +0300 |
commit | 4fae71effb3d108fa4d3467210c15b038c974695 (patch) | |
tree | 24b6fcd9da7ce7843b35be6762e7fb8cc788b3be | |
parent | 4ec14734081d792a869378f277fba6cf33f7bef7 (diff) |
Switch from poltegergeist to cuprite
-rw-r--r-- | .travis.yml | 4 | ||||
-rw-r--r-- | bootstrap.gemspec | 2 | ||||
-rw-r--r-- | test/test_helper.rb | 31 |
3 files changed, 23 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index 42aadc8..bd058f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,9 @@ language: ruby sudo: false +addons: + apt: + packages: + - chromium-browser rvm: - 2.3.8 gemfile: diff --git a/bootstrap.gemspec b/bootstrap.gemspec index bb0b20d..66d0002 100644 --- a/bootstrap.gemspec +++ b/bootstrap.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'term-ansicolor' # Integration testing s.add_development_dependency 'capybara', '>= 2.6.0' - s.add_development_dependency 'poltergeist' + s.add_development_dependency 'cuprite' # Dummy Rails app dependencies s.add_development_dependency 'actionpack', '>= 4.1.5' s.add_development_dependency 'activesupport', '>= 4.1.5' diff --git a/test/test_helper.rb b/test/test_helper.rb index 441734c..65fa6e8 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -12,24 +12,29 @@ end GEM_PATH = File.expand_path('../', File.dirname(__FILE__)) -#= Capybara + Poltergeist -require 'capybara/poltergeist' - -Capybara.register_driver :poltergeist do |app| - Capybara::Poltergeist::Driver.new( - app, - # inspector: '/Applications/Chromium.app/Contents/MacOS/Chromium', # open in inspector: page.driver.debug - window_size: [1280, 1024], - timeout: 90, - js_errors: true - ) +#= Capybara +require 'capybara/cuprite' + +browser_path = ENV['CHROMIUM_BIN'] || %w[ + /usr/bin/chromium-browser + /snap/bin/chromium + /Applications/Chromium.app/Contents/MacOS/Chromium + /Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome +].find { |path| File.executable?(path) } + +Capybara.register_driver :cuprite do |app| + options = { + window_size: [1280, 1024] + } + options[:browser_path] = browser_path if browser_path + Capybara::Cuprite::Driver.new(app, options) end Capybara.configure do |config| config.server = :webrick config.app_host = 'http://localhost:7000' - config.default_driver = :poltergeist - config.javascript_driver = :poltergeist + config.default_driver = :cuprite + config.javascript_driver = :cuprite config.server_port = 7000 config.default_max_wait_time = 10 end |