diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-02-16 18:24:56 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-03-02 17:41:05 -0600 |
| commit | 6cc4cf1e151fb8da16796d7bbab16bc8a1ac08b6 (patch) | |
| tree | dbc7105aa4ecd6498a9354ad6d9c141fb93d277f /features | |
| parent | efff35e96873bd3bea0afceb1d3cd102280813f5 (diff) | |
| download | gitlab-ce-6cc4cf1e151fb8da16796d7bbab16bc8a1ac08b6.tar.gz | |
Fix cherry-picking or reverting through an MR
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/project/commits/revert.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/features/steps/project/commits/revert.rb b/features/steps/project/commits/revert.rb index 94a5d4e2e4d..c9746407344 100644 --- a/features/steps/project/commits/revert.rb +++ b/features/steps/project/commits/revert.rb @@ -36,5 +36,6 @@ class Spinach::Features::RevertCommits < Spinach::FeatureSteps step 'I should see the new merge request notice' do page.should have_content('The commit has been successfully reverted. You can now submit a merge request to get this change into the original branch.') + page.should have_content("From revert-#{Commit.truncate_sha(sample_commit.id)} into master") end end |