Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-16 09:09:57 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-16 09:09:57 +0300
commit93c27b216aa57d57ebd8f5f2581e45dc300324b8 (patch)
treea6cbeb92b9f24baf499cc9ed276e1c0a70ea50c7 /spec/workers/new_merge_request_worker_spec.rb
parent43b91399aeb9f58afc9599b51a941b2bbc745a28 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers/new_merge_request_worker_spec.rb')
-rw-r--r--spec/workers/new_merge_request_worker_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/workers/new_merge_request_worker_spec.rb b/spec/workers/new_merge_request_worker_spec.rb
index 0d64973b0fa..358939a963a 100644
--- a/spec/workers/new_merge_request_worker_spec.rb
+++ b/spec/workers/new_merge_request_worker_spec.rb
@@ -53,7 +53,7 @@ RSpec.describe NewMergeRequestWorker do
expect(Notify).not_to receive(:new_merge_request_email)
.with(mentioned.id, merge_request.id, NotificationReason::MENTIONED)
- expect(Gitlab::AppLogger).to receive(:warn).with(message: 'Skipping sending notifications', user: user.id, klass: merge_request.class, object_id: merge_request.id)
+ expect(Gitlab::AppLogger).to receive(:warn).with(message: 'Skipping sending notifications', user: user.id, klass: merge_request.class.to_s, object_id: merge_request.id)
worker.perform(merge_request.id, user.id)
end