diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-20 03:37:44 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-04-20 03:37:44 +0300 |
| commit | d170133bded904603833f1b9e2727def3805962d (patch) | |
| tree | a1c1e1f9973b43a5ff2482d4e1b91b219c5ac3af /spec/requests/api/commits_spec.rb | |
| parent | bfb635a4afea60751a44e6454f9c36850b5342c9 (diff) | |
Refactor changing files in web UI
Diffstat (limited to 'spec/requests/api/commits_spec.rb')
| -rw-r--r-- | spec/requests/api/commits_spec.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb index a10d876ffad..42dbab586cd 100644 --- a/spec/requests/api/commits_spec.rb +++ b/spec/requests/api/commits_spec.rb @@ -599,8 +599,7 @@ describe API::Commits, api: true do post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user), branch: 'markdown' expect(response).to have_http_status(400) - expect(json_response['message']).to eq('Sorry, we cannot cherry-pick this commit automatically. - A cherry-pick may have already been performed with this commit, or a more recent commit may have updated some of its content.') + expect(json_response['message']).to include('Sorry, we cannot cherry-pick this commit automatically.') end it 'returns 400 if you are not allowed to push to the target branch' do |