diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-04-14 21:48:23 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-04-14 21:48:23 +0000 |
| commit | ef3fb77f0fd108d0e66d8ea63efd15e0af49b3eb (patch) | |
| tree | 156672c6906ceb643584848a3e24f8a06dd82718 /features | |
| parent | 160f1fd225944b4cedd9d5223cdc55b2f3ed0ea7 (diff) | |
| parent | 9cf9cc8ee729c1066d3670159931c5a5ce1ddc93 (diff) | |
| download | gitlab-ce-ef3fb77f0fd108d0e66d8ea63efd15e0af49b3eb.tar.gz | |
Merge branch 'fix-rspec-console-output' into 'master'
Display relevant browser console output when an RSpec test fails.
See merge request gitlab-org/gitlab-ce!18355
Diffstat (limited to 'features')
| -rw-r--r-- | features/support/capybara.rb | 8 |
1 files changed, 1 insertions, 7 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'] |