1 files changed, 14 insertions, 5 deletions
diff --git a/features/steps/project/merge_requests/acceptance.rb b/features/steps/project/merge_requests/acceptance.rb
index 0a3f4649870..3c976f675a2 100644
--- a/features/steps/project/merge_requests/acceptance.rb
+++ b/features/steps/project/merge_requests/acceptance.rb
@@ -1,6 +1,7 @@
 class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps
   include LoginHelpers
   include GitlabRoutingHelper
+  include WaitForVueResource
 
   step 'I am on the Merge Request detail page' do
     visit merge_request_path(@merge_request)
@@ -11,19 +12,27 @@ 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 View Resource requests to complete so they don't blow up if they are
+    # only handled after `DatabaseCleaner` has already run
+    wait_for_vue_resource
   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 View Resource requests to complete so they don't blow up if they are
+    # only handled after `DatabaseCleaner` has already run
+    wait_for_vue_resource
   end
 
   step 'There is an open Merge Request' do
@@ -34,7 +43,7 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps
   end
 
   step 'I am signed in as a developer of the project' do
-    login_as(@user)
+    sign_in(@user)
   end
 
   step 'I should see merge request merged' do