From cdc68de16a71557c9e6789e92f56eb458625fabd Mon Sep 17 00:00:00 2001 From: ddavison Date: Mon, 20 May 2019 13:47:32 -0700 Subject: [PATCH] Move Chrome variables under conditional Dont specify disable-dev-shm-usage for non-chrome browsers --- qa/qa/runtime/browser.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qa/qa/runtime/browser.rb b/qa/qa/runtime/browser.rb index a5218fc9ab1..174a52bd376 100644 --- a/qa/qa/runtime/browser.rb +++ b/qa/qa/runtime/browser.rb @@ -76,6 +76,9 @@ module QA # https://developers.google.com/web/updates/2017/04/headless-chrome#cli options.add_argument("disable-gpu") end + + # Disable /dev/shm use in CI. See https://gitlab.com/gitlab-org/gitlab-ee/issues/4252 + options.add_argument("disable-dev-shm-usage") if QA::Runtime::Env.running_in_ci? end # Use the same profile on QA runs if CHROME_REUSE_PROFILE is true. @@ -85,9 +88,6 @@ module QA options.add_argument("user-data-dir=#{qa_profile_dir}") end - # Disable /dev/shm use in CI. See https://gitlab.com/gitlab-org/gitlab-ee/issues/4252 - options.add_argument("disable-dev-shm-usage") if QA::Runtime::Env.running_in_ci? - selenium_options = { browser: QA::Runtime::Env.browser, clear_local_storage: true,