Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 7 insertions, 0 deletions

diff --git a/spec/lib/gitlab/sidekiq_middleware/worker_context/server_spec.rb b/spec/lib/gitlab/sidekiq_middleware/worker_context/server_spec.rb
index bde19fa7552..ca473462d2e 100644
--- a/spec/lib/gitlab/sidekiq_middleware/worker_context/server_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/worker_context/server_spec.rb
@@ -14,6 +14,7 @@ RSpec.describe Gitlab::SidekiqMiddleware::WorkerContext::Server do
 
       include ApplicationWorker
 
+      feature_category :foo
       worker_context user: nil
 
       def perform(identifier, *args)
@@ -56,6 +57,12 @@ RSpec.describe Gitlab::SidekiqMiddleware::WorkerContext::Server do
       expect(TestWorker.contexts['identifier'].keys).not_to include('meta.user')
     end
 
+    it 'takes the feature category from the worker' do
+      TestWorker.perform_async('identifier', 1)
+
+      expect(TestWorker.contexts['identifier']).to include('meta.feature_category' => 'foo')
+    end
+
     it "doesn't fail for unknown workers" do
       expect { OtherWorker.perform_async }.not_to raise_error
     end