Add latest changes from gitlab-org/gitlab@15-10-stable-eev15.10.0-rc42

4 files changed, 18 insertions, 4 deletions

diff --git a/spec/config/inject_enterprise_edition_module_spec.rb b/spec/config/inject_enterprise_edition_module_spec.rb
index e8c0905ff89..6689fed02f5 100644
--- a/spec/config/inject_enterprise_edition_module_spec.rb
+++ b/spec/config/inject_enterprise_edition_module_spec.rb
@@ -2,7 +2,7 @@
 
 require 'fast_spec_helper'
 
-RSpec.describe InjectEnterpriseEditionModule, feature_category: :not_owned do
+RSpec.describe InjectEnterpriseEditionModule, feature_category: :shared do
   let(:extension_name) { 'FF' }
   let(:extension_namespace) { Module.new }
   let(:fish_name) { 'Fish' }
diff --git a/spec/config/object_store_settings_spec.rb b/spec/config/object_store_settings_spec.rb
index 7b4fa495288..025966c8940 100644
--- a/spec/config/object_store_settings_spec.rb
+++ b/spec/config/object_store_settings_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('config', 'object_store_settings.rb')
 
-RSpec.describe ObjectStoreSettings, feature_category: :not_owned do
+RSpec.describe ObjectStoreSettings, feature_category: :shared do
   describe '#parse!' do
     let(:settings) { Settingslogic.new(config) }
 
diff --git a/spec/config/settings_spec.rb b/spec/config/settings_spec.rb
index 0928f2b72ff..b464a4eee8b 100644
--- a/spec/config/settings_spec.rb
+++ b/spec/config/settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Settings, feature_category: :authentication_and_authorization do
+RSpec.describe Settings, feature_category: :system_access do
   using RSpec::Parameterized::TableSyntax
 
   describe 'omniauth' do
@@ -198,4 +198,18 @@ RSpec.describe Settings, feature_category: :authentication_and_authorization do
       end
     end
   end
+
+  describe '.build_sidekiq_routing_rules' do
+    using RSpec::Parameterized::TableSyntax
+
+    where(:input_rules, :result) do
+      nil                         | [['*', nil]]
+      []                          | [['*', nil]]
+      [['name=foobar', 'foobar']] | [['name=foobar', 'foobar']]
+    end
+
+    with_them do
+      it { expect(described_class.send(:build_sidekiq_routing_rules, input_rules)).to eq(result) }
+    end
+  end
 end
diff --git a/spec/config/smime_signature_settings_spec.rb b/spec/config/smime_signature_settings_spec.rb
index 477ad4a74ed..73dca66c666 100644
--- a/spec/config/smime_signature_settings_spec.rb
+++ b/spec/config/smime_signature_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe SmimeSignatureSettings, feature_category: :not_owned do
+RSpec.describe SmimeSignatureSettings, feature_category: :shared do
   describe '.parse' do
     let(:default_smime_key) { Rails.root.join('.gitlab_smime_key') }
     let(:default_smime_cert) { Rails.root.join('.gitlab_smime_cert') }