diff options
author | Nick Thomas <nick@gitlab.com> | 2019-02-07 15:28:56 +0300 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2019-02-07 15:28:56 +0300 |
commit | 7d37e345b52b427dad6b7533b67a3946a7263192 (patch) | |
tree | ec78bb1848ae0ef960e2b3402e71076cfe3cd403 /spec/requests | |
parent | 041316636b594c15f3fde9839354e3f1309ec763 (diff) | |
parent | b37266004c13ae09f76b2b1fdec02459000124c2 (diff) |
Merge branch '56014-api-merge-request-squash-commit-messages' into 'master'
API support for setting squash commit message during squash
Closes #56014
See merge request gitlab-org/gitlab-ce!24784
Diffstat (limited to 'spec/requests')
-rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index 51343287a13..0f5f6e38819 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -951,6 +951,29 @@ describe API::MergeRequests do expect(response).to have_gitlab_http_status(404) end + + describe "the squash_commit_message param" do + let(:squash_commit) do + project.repository.commits_between(json_response['diff_refs']['start_sha'], json_response['merge_commit_sha']).first + end + + it "results in a specific squash commit message when set" do + squash_commit_message = 'My custom squash commit message' + + put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user), params: { + squash: true, + squash_commit_message: squash_commit_message + } + + expect(squash_commit.message.chomp).to eq(squash_commit_message) + end + + it "results in a default squash commit message when not set" do + put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user), params: { squash: true } + + expect(squash_commit.message).to eq(merge_request.default_squash_commit_message) + end + end end describe "PUT /projects/:id/merge_requests/:merge_request_iid" do |