diff --git a/Gemfile b/Gemfile index 8288f259d..a556d6377 100644 --- a/Gemfile +++ b/Gemfile @@ -84,14 +84,13 @@ group :development, :test do end group :test do - gem "capybara", "~> 3.37.1" + gem "capybara", "~> 3.39.2" gem "capybara-webmock", "~> 0.7.0" gem "email_spec", "~> 2.2.0" gem "rspec-rails", "~> 5.1.2" - gem "selenium-webdriver", "~> 4.0.0" + gem "selenium-webdriver", "~> 4.11.0" gem "simplecov", "~> 0.21.2", require: false gem "simplecov-lcov", "~> 0.8.0", require: false - gem "webdrivers", "~> 4.7.0" end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index c9a8a8833..8d94e82f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -125,7 +125,7 @@ GEM capistrano (~> 3.7) capistrano-bundler puma (>= 4.0, < 6.0) - capybara (3.37.1) + capybara (3.39.2) addressable matrix mini_mime (>= 0.1.3) @@ -150,7 +150,6 @@ GEM actionpack (>= 3.1) caxlsx (>= 3.0) chef-utils (16.4.41) - childprocess (4.1.0) chronic (0.10.2) ckeditor (4.3.0) orm_adapter (~> 0.5.0) @@ -578,10 +577,10 @@ GEM faraday (>= 0.17.3, < 3) scss_lint (0.59.0) sass (~> 3.5, >= 3.5.5) - selenium-webdriver (4.0.3) - childprocess (>= 0.5, < 5.0) + selenium-webdriver (4.11.0) rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) @@ -650,11 +649,8 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webdrivers (4.7.0) - nokogiri (~> 1.6) - rubyzip (>= 1.3.0) - selenium-webdriver (> 3.141, < 5.0) webrick (1.8.1) + websocket (1.2.9) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -687,7 +683,7 @@ DEPENDENCIES capistrano-rails (~> 1.6.2) capistrano3-delayed-job (~> 1.7.6) capistrano3-puma (~> 5.2.0) - capybara (~> 3.37.1) + capybara (~> 3.39.2) capybara-webmock (~> 0.7.0) caxlsx (~> 3.2.0) caxlsx_rails (~> 0.6.3) @@ -755,7 +751,7 @@ DEPENDENCIES sassc-rails (~> 2.1.2) savon (~> 2.13.0) scss_lint (~> 0.59.0) - selenium-webdriver (~> 4.0.0) + selenium-webdriver (~> 4.11.0) simplecov (~> 0.21.2) simplecov-lcov (~> 0.8.0) sitemap_generator (~> 6.3.0) @@ -769,7 +765,6 @@ DEPENDENCIES uuidtools (~> 2.2.0) view_component (~> 2.78.0) web-console (~> 4.2.0) - webdrivers (~> 4.7.0) whenever (~> 1.0.0) wicked_pdf (~> 2.6.3) wkhtmltopdf-binary (~> 0.12.6) diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 170c2e78a..8c5176865 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -54,17 +54,14 @@ end FactoryBot.use_parent_strategy = false Capybara.register_driver :headless_chrome do |app| - capabilities = Selenium::WebDriver::Remote::Capabilities.chrome( - "goog:chromeOptions" => { - args: %W[headless no-sandbox window-size=1200,800 proxy-server=#{Capybara.app_host}:#{Capybara::Webmock.port_number}] - } - ) + options = Selenium::WebDriver::Chrome::Options.new.tap do |opts| + opts.add_argument "--headless" + opts.add_argument "--no-sandbox" + opts.add_argument "--window-size=1200,800" + opts.add_argument "--proxy-server=#{Capybara.app_host}:#{Capybara::Webmock.port_number}" + end - Capybara::Selenium::Driver.new( - app, - browser: :chrome, - capabilities: capabilities - ) + Capybara::Selenium::Driver.new(app, browser: :chrome, options: options) end Capybara.exact = true