diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-02-24 16:01:44 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-02-24 16:01:44 +0000 |
| commit | ceb3eefffb1f4f2f2e0bcb23eb6ad6fc972ba5d8 (patch) | |
| tree | 7b37d1df5754e9794827d73a543f485c371f9792 | |
| parent | 5fda2aad746e14b1a098e8c47eef4e571d0d9de9 (diff) | |
| download | gitlab-ce-fix-compare-service-signature.tar.gz | |
Fix CompareService signaturefix-compare-service-signature
In 8.17+, this takes two arguments to `new`, and two for `execute`. In
8.16, it takes four to `execute`.
| -rw-r--r-- | spec/models/merge_request_spec.rb | 5 |
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 ) |