Add latest changes from gitlab-org/gitlab@master

11 files changed, 29 insertions, 22 deletions

diff --git a/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb b/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
index 6b1e60db5b1..0ad44f31a52 100644
--- a/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
+++ b/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe 'Projects > Files > Project owner sees a link to create a license
 
     expect(page).to have_current_path("/-/ide/project/#{project.full_path}/edit/master/-/LICENSE", ignore_query: true)
 
-    expect(page).to have_selector('.qa-file-templates-bar') # rubocop:disable QA/SelectorUsage
+    expect(page).to have_selector('[data-testid="file-templates-bar"]')
 
     select_template('MIT License')
 
diff --git a/spec/features/projects/tree/create_directory_spec.rb b/spec/features/projects/tree/create_directory_spec.rb
index f6127b38bd6..074469a9b55 100644
--- a/spec/features/projects/tree/create_directory_spec.rb
+++ b/spec/features/projects/tree/create_directory_spec.rb
@@ -49,8 +49,8 @@ RSpec.describe 'Multi-file editor new directory', :js do
     # Compact mode depends on the size of window. If it is shorter than MAX_WINDOW_HEIGHT_COMPACT,
     # (as it is with WEBDRIVER_HEADLESS=0), this initial commit button will exist. Otherwise, if it is
     # taller (as it is by default with chrome headless) then the button will not exist.
-    if page.has_css?('.qa-begin-commit-button') # rubocop:disable QA/SelectorUsage
-      find('.qa-begin-commit-button').click # rubocop:disable QA/SelectorUsage
+    if page.has_css?('[data-testid="begin-commit-button"]')
+      find('[data-testid="begin-commit-button"]').click
     end
 
     fill_in('commit-message', with: 'commit message ide')
diff --git a/spec/features/projects/tree/create_file_spec.rb b/spec/features/projects/tree/create_file_spec.rb
index 33be02a9121..85c644fa528 100644
--- a/spec/features/projects/tree/create_file_spec.rb
+++ b/spec/features/projects/tree/create_file_spec.rb
@@ -39,8 +39,8 @@ RSpec.describe 'Multi-file editor new file', :js do
     # Compact mode depends on the size of window. If it is shorter than MAX_WINDOW_HEIGHT_COMPACT,
     # (as it is with WEBDRIVER_HEADLESS=0), this initial commit button will exist. Otherwise, if it is
     # taller (as it is by default with chrome headless) then the button will not exist.
-    if page.has_css?('.qa-begin-commit-button') # rubocop:disable QA/SelectorUsage
-      find('.qa-begin-commit-button').click # rubocop:disable QA/SelectorUsage
+    if page.has_css?('[data-testid="begin-commit-button"]')
+      find('[data-testid="begin-commit-button"]').click
     end
 
     fill_in('commit-message', with: 'commit message ide')
diff --git a/spec/frontend/groups/components/transfer_group_form_spec.js b/spec/frontend/groups/components/transfer_group_form_spec.js
index 6dc760f4f7c..8cfe8ce8e18 100644
--- a/spec/frontend/groups/components/transfer_group_form_spec.js
+++ b/spec/frontend/groups/components/transfer_group_form_spec.js
@@ -82,7 +82,6 @@ describe('Transfer group form', () => {
 
     it('sets the confirm danger properties', () => {
       expect(findConfirmDanger().props()).toMatchObject({
-        buttonClass: 'qa-transfer-button',
         disabled: true,
         buttonText: confirmButtonText,
         phrase: confirmationPhrase,
diff --git a/spec/lib/gitlab/git/tree_spec.rb b/spec/lib/gitlab/git/tree_spec.rb
index 172d7a3f27b..b520de03929 100644
--- a/spec/lib/gitlab/git/tree_spec.rb
+++ b/spec/lib/gitlab/git/tree_spec.rb
@@ -2,10 +2,11 @@
 
 require "spec_helper"
 
-RSpec.describe Gitlab::Git::Tree, :seed_helper do
+RSpec.describe Gitlab::Git::Tree do
   let_it_be(:user) { create(:user) }
 
-  let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH, '', 'group/project') }
+  let(:project) { create(:project, :repository) }
+  let(:repository) { project.repository.raw }
 
   shared_examples :repo do
     subject(:tree) { Gitlab::Git::Tree.where(repository, sha, path, recursive, pagination_params) }
@@ -105,10 +106,6 @@ RSpec.describe Gitlab::Git::Tree, :seed_helper do
           ).newrev
         end
 
-        after do
-          ensure_seeds
-        end
-
         it { expect(subdir_file.flat_path).to eq('files/flat/path/correct') }
       end
     end
diff --git a/spec/services/pages_domains/obtain_lets_encrypt_certificate_service_spec.rb b/spec/services/pages_domains/obtain_lets_encrypt_certificate_service_spec.rb
index 79654c9b190..ecb445fa441 100644
--- a/spec/services/pages_domains/obtain_lets_encrypt_certificate_service_spec.rb
+++ b/spec/services/pages_domains/obtain_lets_encrypt_certificate_service_spec.rb
@@ -135,7 +135,7 @@ RSpec.describe PagesDomains::ObtainLetsEncryptCertificateService do
       cert.add_extension ef.create_extension("authorityKeyIdentifier",
                                              "keyid:always,issuer:always")
 
-      cert.sign key, OpenSSL::Digest.new('SHA1')
+      cert.sign key, OpenSSL::Digest.new('SHA256')
 
       cert.to_pem
     end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 7c4e2ec3ecc..8d86611407e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -391,6 +391,11 @@ RSpec.configure do |config|
     Gitlab::WithRequestStore.with_request_store { example.run }
   end
 
+  config.around(:example, :enable_rugged) do |example|
+    # Skip tests that need rugged when using praefect DB.
+    example.run unless GitalySetup.praefect_with_db?
+  end
+
   # previous test runs may have left some resources throttled
   config.before do
     ::Gitlab::ExclusiveLease.reset_all!("el:throttle:*")
diff --git a/spec/support/helpers/gitaly_setup.rb b/spec/support/helpers/gitaly_setup.rb
index 56993fc27b7..278dc79e1d0 100644
--- a/spec/support/helpers/gitaly_setup.rb
+++ b/spec/support/helpers/gitaly_setup.rb
@@ -12,6 +12,8 @@ require 'logger'
 require 'fileutils'
 require 'bundler'
 
+require_relative '../../../lib/gitlab/utils'
+
 module GitalySetup
   extend self
 
@@ -139,7 +141,7 @@ module GitalySetup
   end
 
   def start_praefect
-    if ENV['GITALY_PRAEFECT_WITH_DB']
+    if praefect_with_db?
       LOGGER.debug 'Starting Praefect with database election strategy'
       start(:praefect, File.join(tmp_tests_gitaly_dir, 'praefect-db.config.toml'))
     else
@@ -290,7 +292,7 @@ module GitalySetup
 
     # In CI we need to pre-generate both config files.
     # For local testing we'll create the correct file on-demand.
-    if ENV['CI'] || ENV['GITALY_PRAEFECT_WITH_DB'].nil?
+    if ENV['CI'] || !praefect_with_db?
       Gitlab::SetupHelper::Praefect.create_configuration(
         gitaly_dir,
         { 'praefect' => repos_path },
@@ -298,7 +300,7 @@ module GitalySetup
       )
     end
 
-    if ENV['CI'] || ENV['GITALY_PRAEFECT_WITH_DB']
+    if ENV['CI'] || praefect_with_db?
       Gitlab::SetupHelper::Praefect.create_configuration(
         gitaly_dir,
         { 'praefect' => repos_path },
@@ -319,7 +321,7 @@ module GitalySetup
   end
 
   def setup_praefect
-    return unless ENV['GITALY_PRAEFECT_WITH_DB']
+    return unless praefect_with_db?
 
     migrate_cmd = service_cmd(:praefect, File.join(tmp_tests_gitaly_dir, 'praefect-db.config.toml')) + ['sql-migrate']
     system(env, *migrate_cmd, [:out, :err] => 'log/praefect-test.log')
@@ -396,4 +398,8 @@ module GitalySetup
   def praefect_binary
     File.join(tmp_tests_gitaly_dir, "_build", "bin", "praefect")
   end
+
+  def praefect_with_db?
+    Gitlab::Utils.to_boolean(ENV['GITALY_PRAEFECT_WITH_DB'], default: false)
+  end
 end
diff --git a/spec/support/shared_examples/services/alert_management/alert_processing/incident_creation_shared_examples.rb b/spec/support/shared_examples/services/alert_management/alert_processing/incident_creation_shared_examples.rb
index 98834f01ce2..6becc3dc071 100644
--- a/spec/support/shared_examples/services/alert_management/alert_processing/incident_creation_shared_examples.rb
+++ b/spec/support/shared_examples/services/alert_management/alert_processing/incident_creation_shared_examples.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Expects usage of 'incident settings enabled' context.
+# Expects usage of 'incident management settings enabled' context.
 #
 # This shared_example includes the following option:
 # - with_issue: includes a test for when the defined `alert` has an associated issue
@@ -8,7 +8,7 @@
 # This shared_example requires the following variables:
 # - `alert`, required if :with_issue is true
 RSpec.shared_examples 'processes incident issues if enabled' do |with_issue: false|
-  include_examples 'processes incident issues', with_issue
+  include_examples 'processes incident issues', with_issue: with_issue
 
   context 'with incident setting disabled' do
     let(:create_issue) { false }
diff --git a/spec/support/shared_examples/services/alert_management/alert_processing/incident_resolution_shared_examples.rb b/spec/support/shared_examples/services/alert_management/alert_processing/incident_resolution_shared_examples.rb
index 3add5485fca..1973577d742 100644
--- a/spec/support/shared_examples/services/alert_management/alert_processing/incident_resolution_shared_examples.rb
+++ b/spec/support/shared_examples/services/alert_management/alert_processing/incident_resolution_shared_examples.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Expects usage of 'incident settings enabled' context.
+# Expects usage of 'incident management settings enabled' context.
 #
 # This shared_example requires the following variables:
 # - `alert`, alert for which related incidents should be closed
diff --git a/spec/support/shared_examples/services/alert_management/alert_processing/notifications_shared_examples.rb b/spec/support/shared_examples/services/alert_management/alert_processing/notifications_shared_examples.rb
index 5f30b58176b..92e7dee7533 100644
--- a/spec/support/shared_examples/services/alert_management/alert_processing/notifications_shared_examples.rb
+++ b/spec/support/shared_examples/services/alert_management/alert_processing/notifications_shared_examples.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-# Expects usage of 'incident settings enabled' context.
+# Expects usage of 'incident management settings enabled' context.
 #
 # This shared_example includes the following option:
 # - count: number of notifications expected to be sent
 RSpec.shared_examples 'sends alert notification emails if enabled' do |count: 1|
-  include_examples 'sends alert notification emails', count
+  include_examples 'sends alert notification emails', count: count
 
   context 'with email setting disabled' do
     let(:send_email) { false }