Add latest changes from gitlab-org/gitlab@master

1 files changed, 22 insertions, 0 deletions

diff --git a/spec/workers/concerns/cronjob_queue_spec.rb b/spec/workers/concerns/cronjob_queue_spec.rb
index ea3b7bad2e1..0cea67bf116 100644
--- a/spec/workers/concerns/cronjob_queue_spec.rb
+++ b/spec/workers/concerns/cronjob_queue_spec.rb
@@ -14,6 +14,10 @@ describe CronjobQueue do
     end
   end
 
+  before do
+    stub_const("DummyWorker", worker)
+  end
+
   it 'sets the queue name of a worker' do
     expect(worker.sidekiq_options['queue'].to_s).to eq('cronjob:dummy')
   end
@@ -29,4 +33,22 @@ describe CronjobQueue do
     expect(worker_context[:root_namespace]).to be_nil
     expect(worker_context[:project]).to be_nil
   end
+
+  it 'gets scheduled with caller_id set to Cronjob' do
+    worker.perform_async
+
+    job = worker.jobs.last
+
+    expect(job).to include('meta.caller_id' => 'Cronjob')
+  end
+
+  it 'does not set the caller_id if there was already one in the context' do
+    Gitlab::ApplicationContext.with_context(caller_id: 'already set') do
+      worker.perform_async
+    end
+
+    job = worker.jobs.last
+
+    expect(job).to include('meta.caller_id' => 'already set')
+  end
 end