Merge branch 'multiple-clusters-single-list' into 'list-multiple-clusters'list-multiple-clusters

Use single list for multiple clusters

See merge request gitlab-org/gitlab-ce!15669

3 files changed, 32 insertions, 12 deletions

diff --git a/features/steps/project/pages.rb b/features/steps/project/pages.rb
index 124a132d688..f03630e5a91 100644
--- a/features/steps/project/pages.rb
+++ b/features/steps/project/pages.rb
@@ -44,8 +44,8 @@ class Spinach::Features::ProjectPages < Spinach::FeatureSteps
                   project: @project,
                   pipeline: pipeline,
                   ref: 'HEAD',
-                  artifacts_file: fixture_file_upload(Rails.root + 'spec/fixtures/pages.zip'),
-                  artifacts_metadata: fixture_file_upload(Rails.root + 'spec/fixtures/pages.zip.meta')
+                  legacy_artifacts_file: fixture_file_upload(Rails.root + 'spec/fixtures/pages.zip'),
+                  legacy_artifacts_metadata: fixture_file_upload(Rails.root + 'spec/fixtures/pages.zip.meta')
                  )
 
     result = ::Projects::UpdatePagesService.new(@project, build).execute
diff --git a/features/steps/shared/builds.rb b/features/steps/shared/builds.rb
index 3b4c98ec00d..c267195f0e8 100644
--- a/features/steps/shared/builds.rb
+++ b/features/steps/shared/builds.rb
@@ -37,13 +37,13 @@ module SharedBuilds
   step 'recent build has artifacts available' do
     artifacts = Rails.root + 'spec/fixtures/ci_build_artifacts.zip'
     archive = fixture_file_upload(artifacts, 'application/zip')
-    @build.update_attributes(artifacts_file: archive)
+    @build.update_attributes(legacy_artifacts_file: archive)
   end
 
   step 'recent build has artifacts metadata available' do
     metadata = Rails.root + 'spec/fixtures/ci_build_artifacts_metadata.gz'
     gzip = fixture_file_upload(metadata, 'application/x-gzip')
-    @build.update_attributes(artifacts_metadata: gzip)
+    @build.update_attributes(legacy_artifacts_metadata: gzip)
   end
 
   step 'recent build has a build trace' do
diff --git a/features/support/capybara.rb b/features/support/capybara.rb
index 3c4db8b9601..5a77b859113 100644
--- a/features/support/capybara.rb
+++ b/features/support/capybara.rb
@@ -3,21 +3,41 @@ require 'capybara-screenshot/spinach'
 # Give CI some extra time
 timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 60 : 30
 
-Capybara.javascript_driver = :chrome
 Capybara.register_driver :chrome do |app|
-  extra_args = []
-  extra_args << 'headless' unless ENV['CHROME_HEADLESS'] =~ /^(false|no|0)$/i
-
   capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
-    chromeOptions: {
-      'args' => %w[no-sandbox disable-gpu --window-size=1240,1400] + extra_args
+    # This enables access to logs with `page.driver.manage.get_log(:browser)`
+    loggingPrefs: {
+      browser: "ALL",
+      client: "ALL",
+      driver: "ALL",
+      server: "ALL"
     }
   )
 
-  Capybara::Selenium::Driver
-    .new(app, browser: :chrome, desired_capabilities: capabilities)
+  options = Selenium::WebDriver::Chrome::Options.new
+  options.add_argument("window-size=1240,1400")
+
+  # 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
+  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
+
+  Capybara::Selenium::Driver.new(
+    app,
+    browser: :chrome,
+    desired_capabilities: capabilities,
+    options: options
+  )
 end
 
+Capybara.javascript_driver = :chrome
 Capybara.default_max_wait_time = timeout
 Capybara.ignore_hidden_elements = false