Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/support/capybara.rb')
-rw-r--r--spec/support/capybara.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index 392743fda4a..65abbe12621 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -54,11 +54,7 @@ Capybara.register_server :puma_via_workhorse do |app, port, host, **options|
# In cases of multiple installations of chromedriver, prioritize the version installed by SeleniumManager
# selenium-manager doesn't work with Linux arm64 yet:
# https://github.com/SeleniumHQ/selenium/issues/11357
- if RUBY_PLATFORM.include?('x86_64-linux') ||
- # Rosetta is required on macOS because the selenium-manager
- # binaries (https://github.com/SeleniumHQ/selenium/tree/trunk/common/manager/macos)
- # are only compiled for macOS x86.
- (RUBY_PLATFORM.include?('darwin') && system('/usr/bin/pgrep -q oahd'))
+ if RUBY_PLATFORM.include?('x86_64-linux') || RUBY_PLATFORM.include?('darwin')
chrome_options = Selenium::WebDriver::Chrome::Options.chrome
chromedriver_path = File.dirname(Selenium::WebDriver::SeleniumManager.driver_path(chrome_options))
ENV['PATH'] = "#{chromedriver_path}:#{ENV['PATH']}" # rubocop:disable RSpec/EnvAssignment