summaryrefslogtreecommitdiff
path: root/spec/workers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-28 12:08:40 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-28 12:08:40 +0000
commit24e7d185395af41290e5622cad160b7efe230145 (patch)
tree61c2c5d429caf996bb71c2b617273c04e7946218 /spec/workers
parenta2ee63d924727701913f1fc9572f1182f40fda23 (diff)
downloadgitlab-ce-24e7d185395af41290e5622cad160b7efe230145.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers')
-rw-r--r--spec/workers/concerns/limited_capacity/worker_spec.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/workers/concerns/limited_capacity/worker_spec.rb b/spec/workers/concerns/limited_capacity/worker_spec.rb
index 8a15675c04d..2c33c8666ec 100644
--- a/spec/workers/concerns/limited_capacity/worker_spec.rb
+++ b/spec/workers/concerns/limited_capacity/worker_spec.rb
@@ -121,7 +121,8 @@ RSpec.describe LimitedCapacity::Worker, :clean_gitlab_redis_queues, :aggregate_f
it 'reports prometheus metrics' do
allow(worker).to receive(:perform_work)
- expect(worker).to receive(:report_prometheus_metrics)
+ expect(worker).to receive(:report_prometheus_metrics).once.and_call_original
+ expect(worker).to receive(:report_running_jobs_metrics).twice.and_call_original
perform
end