Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 0 deletions

diff --git a/spec/config/settings_spec.rb b/spec/config/settings_spec.rb
index d344a0e28e6..b464a4eee8b 100644
--- a/spec/config/settings_spec.rb
+++ b/spec/config/settings_spec.rb
@@ -198,4 +198,18 @@ RSpec.describe Settings, feature_category: :system_access 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