Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

1 files changed, 9 insertions, 0 deletions

diff --git a/spec/lib/gitlab/error_tracking/processor/sidekiq_processor_spec.rb b/spec/lib/gitlab/error_tracking/processor/sidekiq_processor_spec.rb
index af5f11c9362..3febc10831a 100644
--- a/spec/lib/gitlab/error_tracking/processor/sidekiq_processor_spec.rb
+++ b/spec/lib/gitlab/error_tracking/processor/sidekiq_processor_spec.rb
@@ -178,5 +178,14 @@ RSpec.describe Gitlab::ErrorTracking::Processor::SidekiqProcessor do
         expect(result_hash.dig(:extra, :sidekiq)).to be_nil
       end
     end
+
+    context 'when there is Sidekiq data but no job' do
+      let(:value) { { other: 'foo' } }
+      let(:wrapped_value) { { extra: { sidekiq: value } } }
+
+      it 'does nothing' do
+        expect(result_hash.dig(:extra, :sidekiq)).to eq(value)
+      end
+    end
   end
 end