Skip to content

Commit 7613f39

Browse files
committed
fix(tests): fix chromedriver error for capybara tests
1 parent df9f3c4 commit 7613f39

File tree

5 files changed

+25
-38
lines changed

5 files changed

+25
-38
lines changed

.circleci/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ commands:
2727
steps:
2828
- checkout
2929
- browser-tools/install-chrome
30-
- browser-tools/install-chromedriver
3130
- restore_cache:
3231
keys:
3332
- bundler-dependencies-{{ checksum "Gemfile.lock" }}

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7
1+
3.2

Gemfile.lock

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -91,25 +91,22 @@ GEM
9191
minitest (>= 5.1)
9292
tzinfo (~> 2.0)
9393
zeitwerk (~> 2.3)
94-
addressable (2.8.0)
95-
public_suffix (>= 2.0.2, < 5.0)
94+
addressable (2.8.5)
95+
public_suffix (>= 2.0.2, < 6.0)
9696
arbre (1.6.0)
9797
activesupport (>= 3.0.0, < 7.1)
9898
ruby2_keywords (>= 0.0.2, < 1.0)
9999
ast (2.4.0)
100100
builder (3.2.4)
101-
capybara (3.31.0)
101+
capybara (3.39.2)
102102
addressable
103+
matrix
103104
mini_mime (>= 0.1.3)
104105
nokogiri (~> 1.8)
105106
rack (>= 1.6.0)
106107
rack-test (>= 0.6.3)
107-
regexp_parser (~> 1.5)
108+
regexp_parser (>= 1.5, < 3.0)
108109
xpath (~> 3.2)
109-
capybara-selenium (0.0.6)
110-
capybara
111-
selenium-webdriver
112-
childprocess (3.0.0)
113110
climate_control (0.2.0)
114111
coderay (1.1.2)
115112
concurrent-ruby (1.1.10)
@@ -194,13 +191,13 @@ GEM
194191
mime-types-data (~> 3.2015)
195192
mime-types-data (3.2019.1009)
196193
mini_magick (4.11.0)
197-
mini_mime (1.1.2)
198-
mini_portile2 (2.8.0)
194+
mini_mime (1.1.5)
195+
mini_portile2 (2.8.4)
199196
minitest (5.16.3)
200197
nenv (0.3.0)
201198
nio4r (2.5.8)
202-
nokogiri (1.13.9)
203-
mini_portile2 (~> 2.8.0)
199+
nokogiri (1.15.4)
200+
mini_portile2 (~> 2.8.2)
204201
racc (~> 1.4)
205202
notiffany (0.1.3)
206203
nenv (~> 0.1)
@@ -221,14 +218,14 @@ GEM
221218
pry-rails (0.3.9)
222219
pry (>= 0.10.4)
223220
psych (3.1.0)
224-
public_suffix (4.0.6)
221+
public_suffix (5.0.3)
225222
puma (5.3.1)
226223
nio4r (~> 2.0)
227-
racc (1.6.0)
228-
rack (2.2.4)
224+
racc (1.7.1)
225+
rack (2.2.8)
229226
rack-proxy (0.6.5)
230227
rack
231-
rack-test (2.0.2)
228+
rack-test (2.1.0)
232229
rack (>= 1.3)
233230
rails (6.1.7)
234231
actioncable (= 6.1.7)
@@ -266,7 +263,7 @@ GEM
266263
rb-inotify (0.10.1)
267264
ffi (~> 1.0)
268265
redcarpet (3.6.0)
269-
regexp_parser (1.6.0)
266+
regexp_parser (2.8.1)
270267
require_all (3.0.0)
271268
responders (3.1.0)
272269
actionpack (>= 5.2)
@@ -308,7 +305,7 @@ GEM
308305
ruby-vips (2.1.4)
309306
ffi (~> 1.12)
310307
ruby2_keywords (0.0.5)
311-
rubyzip (2.2.0)
308+
rubyzip (2.3.2)
312309
sassc (2.4.0)
313310
ffi (~> 1.9)
314311
sassc-rails (2.1.2)
@@ -317,9 +314,10 @@ GEM
317314
sprockets (> 3.0)
318315
sprockets-rails
319316
tilt
320-
selenium-webdriver (3.142.7)
321-
childprocess (>= 0.5, < 4.0)
322-
rubyzip (>= 1.2.2)
317+
selenium-webdriver (4.11.0)
318+
rexml (~> 3.2, >= 3.2.5)
319+
rubyzip (>= 1.2.2, < 3.0)
320+
websocket (~> 1.0)
323321
semantic_range (3.0.0)
324322
shellany (0.0.1)
325323
shoulda-matchers (4.2.0)
@@ -342,15 +340,12 @@ GEM
342340
tzinfo (2.0.5)
343341
concurrent-ruby (~> 1.0)
344342
unicode-display_width (1.4.1)
345-
webdrivers (4.2.0)
346-
nokogiri (~> 1.6)
347-
rubyzip (>= 1.3.0)
348-
selenium-webdriver (>= 3.0, < 4.0)
349343
webpacker (5.3.0)
350344
activesupport (>= 5.2)
351345
rack-proxy (>= 0.6.1)
352346
railties (>= 5.2)
353347
semantic_range (>= 2.3.0)
348+
websocket (1.2.9)
354349
websocket-driver (0.7.5)
355350
websocket-extensions (>= 0.1.0)
356351
websocket-extensions (0.1.5)
@@ -368,7 +363,7 @@ DEPENDENCIES
368363
aasm
369364
activeadmin (~> 3.0)
370365
activeadmin_addons!
371-
capybara-selenium
366+
capybara
372367
database_cleaner
373368
enumerize (~> 2.0)
374369
factory_bot_rails
@@ -385,10 +380,10 @@ DEPENDENCIES
385380
rspec-rails
386381
rspec_junit_formatter
387382
rubocop (~> 0.65.0)
383+
selenium-webdriver (~> 4.10)
388384
shoulda-matchers
389385
shrine (~> 3.0)
390386
sqlite3
391-
webdrivers
392387
webpacker (~> 5.0)
393388

394389
BUNDLED WITH

activeadmin_addons.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
2727
s.add_dependency "xdan-datetimepicker-rails", "~> 2.5.1"
2828

2929
s.add_development_dependency "aasm"
30-
s.add_development_dependency "capybara-selenium"
30+
s.add_development_dependency "capybara"
3131
s.add_development_dependency "database_cleaner"
3232
s.add_development_dependency "enumerize", "~> 2.0"
3333
s.add_development_dependency "factory_bot_rails"
@@ -43,8 +43,8 @@ Gem::Specification.new do |s|
4343
s.add_development_dependency "rspec-rails"
4444
s.add_development_dependency "rspec_junit_formatter"
4545
s.add_development_dependency "rubocop", "~> 0.65.0"
46+
s.add_development_dependency "selenium-webdriver", '~> 4.10'
4647
s.add_development_dependency "shoulda-matchers"
4748
s.add_development_dependency "shrine", "~> 3.0"
4849
s.add_development_dependency "sqlite3"
49-
s.add_development_dependency "webdrivers"
5050
end

spec/rails_helper.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
require File.expand_path("../dummy/config/environment", __FILE__)
55
require 'rspec/rails'
66
require 'factory_bot_rails'
7-
require 'webdrivers'
87
require 'capybara/rspec'
98
require 'capybara/rails'
109
require 'selenium-webdriver'
@@ -39,12 +38,6 @@
3938
DatabaseCleaner.clean
4039
end
4140

42-
# Cache the download of chrome driver for 1 day
43-
Webdrivers.cache_time = 86_400
44-
45-
# Allow override of default path to Chrome (we use this in Travis)
46-
Selenium::WebDriver::Chrome.path = ENV['CHROME_PATH'] if ENV['CHROME_PATH']
47-
4841
Capybara.register_driver :chrome do |app|
4942
Capybara::Selenium::Driver.new(app, browser: :chrome)
5043
end

0 commit comments

Comments
 (0)