1 files changed, 17 insertions, 26 deletions
diff --git a/spec/features/merge_request/user_reverts_merge_request_spec.rb b/spec/features/merge_request/user_reverts_merge_request_spec.rb
index 5e9611de460..9cbba6c470f 100644
--- a/spec/features/merge_request/user_reverts_merge_request_spec.rb
+++ b/spec/features/merge_request/user_reverts_merge_request_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe 'User reverts a merge request', :js do
-  let(:merge_request) { create(:merge_request, :with_diffs, :simple, source_project: project) }
+  let(:merge_request) { create(:merge_request, :simple, source_project: project) }
   let(:project) { create(:project, :public, :repository) }
   let(:user) { create(:user) }
 
@@ -17,46 +17,28 @@ RSpec.describe 'User reverts a merge request', :js do
 
     wait_for_requests
 
-    visit(merge_request_path(merge_request))
+    # do not reload the page by visiting, let javascript update the page as it will validate we have loaded the modal
+    # code correctly on page update that adds the `revert` button
   end
 
   it 'reverts a merge request', :sidekiq_might_not_need_inline do
-    find("a[href='#modal-revert-commit']").click
+    revert_commit
 
-    page.within('#modal-revert-commit') do
-      uncheck('create_merge_request')
-      click_button('Revert')
-    end
+    wait_for_requests
 
     expect(page).to have_content('The merge request has been successfully reverted.')
-
-    wait_for_requests
   end
 
   it 'does not revert a merge request that was previously reverted', :sidekiq_might_not_need_inline do
-    find("a[href='#modal-revert-commit']").click
-
-    page.within('#modal-revert-commit') do
-      uncheck('create_merge_request')
-      click_button('Revert')
-    end
-
-    find("a[href='#modal-revert-commit']").click
+    revert_commit
 
-    page.within('#modal-revert-commit') do
-      uncheck('create_merge_request')
-      click_button('Revert')
-    end
+    revert_commit
 
     expect(page).to have_content('Sorry, we cannot revert this merge request automatically.')
   end
 
   it 'reverts a merge request in a new merge request', :sidekiq_might_not_need_inline do
-    find("a[href='#modal-revert-commit']").click
-
-    page.within('#modal-revert-commit') do
-      click_button('Revert')
-    end
+    revert_commit(create_merge_request: true)
 
     expect(page).to have_content('The merge request has been successfully reverted. You can now submit a merge request to get this change into the original branch.')
   end
@@ -68,4 +50,13 @@ RSpec.describe 'User reverts a merge request', :js do
 
     expect(page).not_to have_link('Revert')
   end
+
+  def revert_commit(create_merge_request: false)
+    click_button('Revert')
+
+    page.within('[data-testid="modal-commit"]') do
+      uncheck('create_merge_request') unless create_merge_request
+      click_button('Revert')
+    end
+  end
 end