diff options
author | George Andrinopoulos <geoandri@gmail.com> | 2018-07-25 21:22:01 +0300 |
---|---|---|
committer | George Andrinopoulos <geoandri@gmail.com> | 2018-08-19 23:11:49 +0300 |
commit | 70830c23002c198d96cae1bf9cdf153b025f9c09 (patch) | |
tree | 4499094d1178aba839cf3db6668b1e457213025f /spec/features/projects | |
parent | 00baed8cb0725f7e05e6dab4e498acf2b425a5b2 (diff) | |
download | gitlab-ce-70830c23002c198d96cae1bf9cdf153b025f9c09.tar.gz |
Add target branch to cherry pick confirmation message
Diffstat (limited to 'spec/features/projects')
-rw-r--r-- | spec/features/projects/commit/cherry_pick_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/projects/commit/cherry_pick_spec.rb b/spec/features/projects/commit/cherry_pick_spec.rb index bc3c00dafe2..d53d6d32c3c 100644 --- a/spec/features/projects/commit/cherry_pick_spec.rb +++ b/spec/features/projects/commit/cherry_pick_spec.rb @@ -21,7 +21,7 @@ describe 'Cherry-pick Commits' do uncheck 'create_merge_request' click_button 'Cherry-pick' end - expect(page).to have_content('The commit has been successfully cherry-picked.') + expect(page).to have_content('The commit has been successfully cherry-picked into master.') end end @@ -32,7 +32,7 @@ describe 'Cherry-pick Commits' do uncheck 'create_merge_request' click_button 'Cherry-pick' end - expect(page).to have_content('The commit has been successfully cherry-picked.') + expect(page).to have_content('The commit has been successfully cherry-picked into master.') end end @@ -59,7 +59,7 @@ describe 'Cherry-pick Commits' do page.within('#modal-cherry-pick-commit') do click_button 'Cherry-pick' end - expect(page).to have_content('The commit has been successfully cherry-picked. You can now submit a merge request to get this change into the original branch.') + expect(page).to have_content('The commit has been successfully cherry-picked into master. You can now submit a merge request to get this change into the original branch.') expect(page).to have_content("From cherry-pick-#{master_pickable_commit.short_id} into master") end end @@ -86,7 +86,7 @@ describe 'Cherry-pick Commits' do click_button 'Cherry-pick' end - expect(page).to have_content('The commit has been successfully cherry-picked.') + expect(page).to have_content('The commit has been successfully cherry-picked into master.') end end |