Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Travis builds on master #600

Merged
merged 2 commits into from
Mar 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
add_ons:
chrome: stable

language: ruby

rvm:
Expand All @@ -8,6 +9,9 @@ rvm:
- 2.5.5
- rbx-2

jdk:
- openjdk8

gemfile:
- gemfiles/rails_4_2.gemfile

Expand All @@ -28,10 +32,8 @@ matrix:
- rvm: rbx-2

before_install:
- sudo apt-get install chromium-chromedriver
- google-chrome-stable --headless --disable-gpu
- gem uninstall -i $(rvm gemdir)@global -ax bundler
- gem install bundler -v 1.17.3
- gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
- gem install bundler -v '< 2'

before_script:
- "export PATH=$PATH:/usr/lib/chromium-browser/"
Expand Down
1 change: 1 addition & 0 deletions calagator.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'rspec-rails', '~> 3.2'
s.add_development_dependency 'rubocop', '~> 0.67.2'
s.add_development_dependency 'selenium-webdriver'
s.add_development_dependency 'webdrivers'
s.add_development_dependency 'simplecov', '~> 0.10.0'
s.add_development_dependency 'sqlite3', '~> 1.3.6'
s.add_development_dependency 'sunspot_solr', '~> 2.1'
Expand Down
1 change: 1 addition & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
require 'capybara'
require 'capybara/rspec'
require 'database_cleaner'
require 'webdrivers/chromedriver'
require 'selenium-webdriver'
require 'timecop'
require 'webmock'
Expand Down
6 changes: 4 additions & 2 deletions spec/support/webmock.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

RSpec.configure do |config|
config.before(:suite) do
# poltergeist and solr need to connect to localhost
WebMock.disable_net_connect!(allow_localhost: true)
WebMock.disable_net_connect!(
allow_localhost: true, # poltergeist and solr need to connect to localhost
allow: 'chromedriver.storage.googleapis.com' # webdrivers needs to download chromedriver
)
end
end