Skip to content

Commit

Permalink
Merge pull request #111 from solidusio-contrib/kennyadsl/selenium-hea…
Browse files Browse the repository at this point in the history
…dless

Update Travis CI and Capybara driver
  • Loading branch information
kennyadsl authored Mar 1, 2018
2 parents f0316b8 + c440402 commit 14039be
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
12 changes: 7 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 3 additions & 2 deletions solidus_i18n.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
9 changes: 2 additions & 7 deletions spec/support/capybara.rb
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 14039be

Please sign in to comment.