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
path: root/spec
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-02-24 19:01:44 +0300
committerSean McGivern <sean@gitlab.com>2017-02-24 19:01:44 +0300
commitceb3eefffb1f4f2f2e0bcb23eb6ad6fc972ba5d8 (patch)
tree7b37d1df5754e9794827d73a543f485c371f9792 /spec
parent5fda2aad746e14b1a098e8c47eef4e571d0d9de9 (diff)
Fix CompareService signature
In 8.17+, this takes two arguments to `new`, and two for `execute`. In 8.16, it takes four to `execute`.
Diffstat (limited to 'spec')
-rw-r--r--spec/models/merge_request_spec.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index d90577e1a84..57026db2881 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -232,10 +232,9 @@ describe MergeRequest, models: true do
context 'when there are no MR diffs' do
before do
- merge_request.compare = CompareService.new(
+ merge_request.compare = CompareService.new.execute(
merge_request.source_project,
- merge_request.source_branch
- ).execute(
+ merge_request.source_branch,
merge_request.target_project,
merge_request.target_branch
)