Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

1 files changed, 9 insertions, 0 deletions

diff --git a/spec/workers/concerns/application_worker_spec.rb b/spec/workers/concerns/application_worker_spec.rb
index 5fde54b98f0..0abb029f146 100644
--- a/spec/workers/concerns/application_worker_spec.rb
+++ b/spec/workers/concerns/application_worker_spec.rb
@@ -103,6 +103,15 @@ RSpec.describe ApplicationWorker do
       expect(instance.logging_extras).to eq({ 'extra.gitlab_foo_bar_dummy_worker.key1' => "value1", 'extra.gitlab_foo_bar_dummy_worker.key2' => "value2" })
     end
 
+    it 'returns extra data to be logged that was set from #log_hash_metadata_on_done' do
+      instance.log_hash_metadata_on_done({ key1: 'value0', key2: 'value1' })
+
+      expect(instance.logging_extras).to match_array({
+        'extra.gitlab_foo_bar_dummy_worker.key1' => 'value0',
+        'extra.gitlab_foo_bar_dummy_worker.key2' => 'value1'
+      })
+    end
+
     context 'when nothing is set' do
       it 'returns {}' do
         expect(instance.logging_extras).to eq({})