diff options
Diffstat (limited to 'features/steps/project/merge_requests/acceptance.rb')
| -rw-r--r-- | features/steps/project/merge_requests/acceptance.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/features/steps/project/merge_requests/acceptance.rb b/features/steps/project/merge_requests/acceptance.rb index 7521a9439e3..517400cd82b 100644 --- a/features/steps/project/merge_requests/acceptance.rb +++ b/features/steps/project/merge_requests/acceptance.rb @@ -12,15 +12,15 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps end step 'I click on "Remove source branch" option' do - check('Remove source branch') + uncheck('Remove source branch') end step 'I click on Accept Merge Request' do - click_button('Accept merge request') + click_button('Merge') end step 'I should see the Remove Source Branch button' do - expect(page).to have_link('Remove source branch') + expect(page).to have_selector('.js-remove-branch-button') # Wait for AJAX requests to complete so they don't blow up if they are # only handled after `DatabaseCleaner` has already run @@ -28,7 +28,7 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps end step 'I should not see the Remove Source Branch button' do - expect(page).not_to have_link('Remove source branch') + expect(page).not_to have_selector('.js-remove-branch-button') # Wait for AJAX requests to complete so they don't blow up if they are # only handled after `DatabaseCleaner` has already run |