diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-09 16:08:38 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-10 14:37:32 +0200 |
| commit | 5324c9364346f74ea73c6be27785704e8e2281f8 (patch) | |
| tree | 880b7c61a53dfe8d9ffc5887c68f5e8fb6f59a31 /spec/requests/api/merge_requests_spec.rb | |
| parent | 282674c1108bdd761f4027910a32396fe253bc95 (diff) | |
| download | gitlab-ce-5324c9364346f74ea73c6be27785704e8e2281f8.tar.gz | |
Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to #mergeable_ci_state?
The logic of the method was obviously inverted.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/requests/api/merge_requests_spec.rb')
| -rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index a52148e8b83..1356f87b0e9 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -420,7 +420,7 @@ describe API::API, api: true do end it 'returns 405 if the build failed for a merge request that requires success' do - allow_any_instance_of(MergeRequest).to receive(:cannot_be_merged_because_build_is_not_success?).and_return(true) + allow_any_instance_of(MergeRequest).to receive(:mergeable_ci_state?).and_return(false) put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user) |