summaryrefslogtreecommitdiff
path: root/spec/workers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-05 03:09:03 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-05 03:09:03 +0000
commit7c7c4fade6f8f1085a95bf48ae90222345f05bee (patch)
tree2ebf505edfa85ebf21c2585419d79cc0b02f6603 /spec/workers
parent4fd77e112fac07c5b904668b7d5f500589f8d2d5 (diff)
downloadgitlab-ce-7c7c4fade6f8f1085a95bf48ae90222345f05bee.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers')
-rw-r--r--spec/workers/concerns/application_worker_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/workers/concerns/application_worker_spec.rb b/spec/workers/concerns/application_worker_spec.rb
index a18b83f199b..07e11f014c3 100644
--- a/spec/workers/concerns/application_worker_spec.rb
+++ b/spec/workers/concerns/application_worker_spec.rb
@@ -45,7 +45,7 @@ RSpec.describe ApplicationWorker do
instance.jid = 'a jid'
expect(result).to include(
- 'class' => worker.class,
+ 'class' => instance.class.name,
'job_status' => 'running',
'queue' => worker.queue,
'jid' => instance.jid
@@ -69,7 +69,7 @@ RSpec.describe ApplicationWorker do
it 'does not override predefined context keys with custom payload' do
payload['class'] = 'custom value'
- expect(result).to include('class' => worker.class)
+ expect(result).to include('class' => instance.class.name)
end
end