diff options
author | Saverio Miroddi <saverio.pub2@gmail.com> | 2017-08-17 21:26:06 +0300 |
---|---|---|
committer | Saverio Miroddi <saverio.pub2@gmail.com> | 2017-08-17 23:38:47 +0300 |
commit | c0f921606c91e3e5c601497f57becbf4c6a8e3ac (patch) | |
tree | 3cb77d0f5b837d16fd572946be9d308541d54d85 /spec/requests | |
parent | 919c0c7ba7369970bf57e9388333af120b74203d (diff) |
Correct the cherry-pick message for merge commits
The list of commits must be generated from the merge request,
not from a diff of the branches.
Diffstat (limited to 'spec/requests')
-rw-r--r-- | spec/requests/api/commits_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/v3/commits_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb index 1fba7fcc10a..57baf9cd3b3 100644 --- a/spec/requests/api/commits_spec.rb +++ b/spec/requests/api/commits_spec.rb @@ -791,7 +791,7 @@ describe API::Commits do expect(response).to have_gitlab_http_status(201) expect(response).to match_response_schema('public_api/v4/commit/basic') expect(json_response['title']).to eq(commit.title) - expect(json_response['message']).to eq(commit.cherry_pick_message(project, branch)) + expect(json_response['message']).to eq(commit.cherry_pick_message(user)) expect(json_response['author_name']).to eq(commit.author_name) expect(json_response['committer_name']).to eq(user.name) end diff --git a/spec/requests/api/v3/commits_spec.rb b/spec/requests/api/v3/commits_spec.rb index 9edf21719cd..8fb96b3c7c5 100644 --- a/spec/requests/api/v3/commits_spec.rb +++ b/spec/requests/api/v3/commits_spec.rb @@ -474,7 +474,7 @@ describe API::V3::Commits do expect(response).to have_http_status(201) expect(json_response['title']).to eq(master_pickable_commit.title) - expect(json_response['message']).to eq(master_pickable_commit.cherry_pick_message(project, 'master')) + expect(json_response['message']).to eq(master_pickable_commit.cherry_pick_message(user)) expect(json_response['author_name']).to eq(master_pickable_commit.author_name) expect(json_response['committer_name']).to eq(user.name) end |