summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--features/support/capybara.rb8
-rw-r--r--spec/support/capybara.rb8
2 files changed, 2 insertions, 14 deletions
diff --git a/features/support/capybara.rb b/features/support/capybara.rb
index 4e2b3c67af5..8879c9ab650 100644
--- a/features/support/capybara.rb
+++ b/features/support/capybara.rb
@@ -21,13 +21,7 @@ Capybara.register_driver :chrome do |app|
options.add_argument("no-sandbox")
# Run headless by default unless CHROME_HEADLESS specified
- unless ENV['CHROME_HEADLESS'] =~ /^(false|no|0)$/i
- options.add_argument("headless")
-
- # Chrome documentation says this flag is needed for now
- # https://developers.google.com/web/updates/2017/04/headless-chrome#cli
- options.add_argument("disable-gpu")
- end
+ options.add_argument("headless") unless ENV['CHROME_HEADLESS'] =~ /^(false|no|0)$/i
# Disable /dev/shm use in CI. See https://gitlab.com/gitlab-org/gitlab-ee/issues/4252
options.add_argument("disable-dev-shm-usage") if ENV['CI'] || ENV['CI_SERVER']
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index b8b44e001db..e0fb4b83229 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -35,13 +35,7 @@ Capybara.register_driver :chrome do |app|
options.add_argument("no-sandbox")
# Run headless by default unless CHROME_HEADLESS specified
- unless ENV['CHROME_HEADLESS'] =~ /^(false|no|0)$/i
- options.add_argument("headless")
-
- # Chrome documentation says this flag is needed for now
- # https://developers.google.com/web/updates/2017/04/headless-chrome#cli
- options.add_argument("disable-gpu")
- end
+ options.add_argument("headless") unless ENV['CHROME_HEADLESS'] =~ /^(false|no|0)$/i
# Disable /dev/shm use in CI. See https://gitlab.com/gitlab-org/gitlab-ee/issues/4252
options.add_argument("disable-dev-shm-usage") if ENV['CI'] || ENV['CI_SERVER']