diff options
Diffstat (limited to 'features/steps/project/merge_requests/revert.rb')
| -rw-r--r-- | features/steps/project/merge_requests/revert.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/features/steps/project/merge_requests/revert.rb b/features/steps/project/merge_requests/revert.rb index 1149c1c2426..25ccf5ab180 100644 --- a/features/steps/project/merge_requests/revert.rb +++ b/features/steps/project/merge_requests/revert.rb @@ -1,6 +1,6 @@ class Spinach::Features::RevertMergeRequests < Spinach::FeatureSteps include LoginHelpers - include GitlabRoutingHelper + include WaitForRequests step 'I click on the revert button' do find("a[href='#modal-revert-commit']").click @@ -15,6 +15,7 @@ class Spinach::Features::RevertMergeRequests < Spinach::FeatureSteps step 'I should see the revert merge request notice' do page.should have_content('The merge request has been successfully reverted.') + wait_for_requests end step 'I should not see the revert button' do @@ -26,7 +27,7 @@ class Spinach::Features::RevertMergeRequests < Spinach::FeatureSteps end step 'I click on Accept Merge Request' do - click_button('Accept merge request') + click_button('Merge') end step 'I am signed in as a developer of the project' do |