diff options
| author | Saverio Miroddi <saverio.pub2@gmail.com> | 2017-08-16 12:43:18 +0200 |
|---|---|---|
| committer | Saverio Miroddi <saverio.pub2@gmail.com> | 2017-08-16 12:43:18 +0200 |
| commit | ae5e806f128e8e737948f4286da92526c74c316e (patch) | |
| tree | 2c1af4f8fd2a1a0b13c4f77fcf55c666aa34f309 | |
| parent | 85aeb884386f9943f8cc95cb1d2faabf011e5c6a (diff) | |
| download | gitlab-ce-ae5e806f128e8e737948f4286da92526c74c316e.tar.gz | |
Fix build failures related to cherry-pick message changes
| -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 992a6e8d76a..1fba7fcc10a 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.message) + expect(json_response['message']).to eq(commit.cherry_pick_message(project, branch)) 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 4a4a5dc5c7c..9edf21719cd 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.message) + expect(json_response['message']).to eq(master_pickable_commit.cherry_pick_message(project, 'master')) expect(json_response['author_name']).to eq(master_pickable_commit.author_name) expect(json_response['committer_name']).to eq(user.name) end |