summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests/refresh_service_spec.rb
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2019-01-03 10:59:14 +0000
committerDouwe Maan <douwe@selenight.nl>2019-01-08 00:27:29 +0100
commita2842241d4f583625053aba4d2c37a2f15b21913 (patch)
tree088aeb8c89c56e20ea5f003e3556584b5b524232 /spec/services/merge_requests/refresh_service_spec.rb
parentcfa7108210490704a8110ee97a26de9ae4d9adaf (diff)
downloadgitlab-ce-a2842241d4f583625053aba4d2c37a2f15b21913.tar.gz
Add committers and authors methods on MergeRequest
These are used by the EE-only approvers feature
Diffstat (limited to 'spec/services/merge_requests/refresh_service_spec.rb')
-rw-r--r--spec/services/merge_requests/refresh_service_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index 1d9c75dedce..1169ed5f9f2 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -509,7 +509,7 @@ describe MergeRequests::RefreshService do
committed_date: Time.now
)
- allow_any_instance_of(MergeRequest).to receive(:commits).and_return([commit])
+ allow_any_instance_of(MergeRequest).to receive(:commits).and_return(CommitCollection.new(@project, [commit], 'feature'))
end
context 'when the merge request is sourced from the same project' do