diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
| commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
| tree | c42be41678c2586d49a75cabce89322082698334 /spec/support/capybara.rb | |
| parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'spec/support/capybara.rb')
| -rw-r--r-- | spec/support/capybara.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index e48a7b322ac..6f96d552da6 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -60,8 +60,8 @@ Capybara.register_driver :chrome do |app| # Chrome won't work properly in a Docker container in sandbox mode options.add_argument("no-sandbox") - # Run headless by default unless CHROME_HEADLESS specified - options.add_argument("headless") unless ENV['CHROME_HEADLESS'] =~ /^(false|no|0)$/i + # Run headless by default unless WEBDRIVER_HEADLESS specified + options.add_argument("headless") unless ENV['WEBDRIVER_HEADLESS'] =~ /^(false|no|0)$/i || ENV['CHROME_HEADLESS'] =~ /^(false|no|0)$/i # Disable /dev/shm use in CI. See https://gitlab.com/gitlab-org/gitlab/issues/4252 options.add_argument("disable-dev-shm-usage") if ENV['CI'] || ENV['CI_SERVER'] @@ -197,7 +197,7 @@ RSpec.configure do |config| raise JSConsoleError, message end rescue Selenium::WebDriver::Error::WebDriverError => error - if error.message =~ /unknown command: session\/[0-9a-zA-Z]+(?:\/se)?\/log/ + if error.message =~ %r{unknown command: session/[0-9a-zA-Z]+(?:/se)?/log} message = "Unable to access Chrome javascript console logs. You may be using an outdated version of ChromeDriver." raise JSConsoleError, message else |