diff options
| author | George Andrinopoulos <geoandri@gmail.com> | 2018-08-20 22:34:14 +0300 |
|---|---|---|
| committer | George Andrinopoulos <geoandri@gmail.com> | 2018-08-20 22:34:14 +0300 |
| commit | 7453a029f4b3a3622e37a105182f432233965617 (patch) | |
| tree | 98c2d7e34ed947200d2b33b6e48efeb8ae541d90 /spec/features | |
| parent | cab5039c91cffd5f1c4f08ce8dce7c67529ec6d1 (diff) | |
| download | gitlab-ce-7453a029f4b3a3622e37a105182f432233965617.tar.gz | |
Fix failing test
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/projects/commit/cherry_pick_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/projects/commit/cherry_pick_spec.rb b/spec/features/projects/commit/cherry_pick_spec.rb index 3caf89e8c5c..a61b614dbc8 100644 --- a/spec/features/projects/commit/cherry_pick_spec.rb +++ b/spec/features/projects/commit/cherry_pick_spec.rb @@ -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 into master. 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 cherry-pick-#{master_pickable_commit.short_id}. 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 |