Refactor spec/features/modal_search_spec.rb

This change refactors `spec/features/modal_search_spec.rb` by adding a method which contains the modal logic shared between both of the tests within the file.

Author: aaronskiba

spec/features/modal_search_spec.rb

@@ -23,28 +23,7 @@
   end
 
   it 'Modal search opens and closes and allows user to search, select and remove items', :js do
-    # Open the modal
-    click_button 'Add a repository'
-    expect(page).to have_text('Repository search')
-
-    within('#modal-search-repositories') do
-      # Search for the Repository
-      fill_in 'research_output_search_term',	with: @model.name
-      click_button 'Apply filter(s)'
-      expect(page).to have_text(@model.description)
-      # Select the repository and make sure it no longer appears in the search results
-      click_link 'Select'
-      expect(page).not_to have_text(@model.description)
-
-      # Using JS to click on button, as click_button '.modal-header button.btn-close' did not work.
-      modal_close_button = find('.modal-header button.btn-close')
-      # Close the modal
-      execute_script('arguments[0].click();', modal_close_button)
-    end
-
-    # Verify that the selection was added to the main page's dom
-    expect(page).not_to have_text('Repository search')
-    expect(page).to have_text(@model.description)
+    perform_modal_actions
     # Verify that we can remove the selection
     click_link 'Remove'
     expect(page).not_to have_text(@model.description)
@@ -55,15 +34,7 @@
     fill_in 'Title', with: 'Test Output'
     select 'Audiovisual', from: 'research_output_output_type'
 
-    # Open the modal and select repository
-    click_button 'Add a repository'
-    within('#modal-search-repositories') do
-      fill_in 'research_output_search_term', with: @model.name
-      click_button 'Apply filter(s)'
-      click_link 'Select'
-      # (execute_script('arguments[0].click();', modal_close_button) works locally here, but not as GitHub Action)
-      find('[data-bs-dismiss="modal"]').click
-    end
+    perform_modal_actions
 
     click_button 'Save'
 
@@ -80,4 +51,31 @@
     expect(research_output.repositories).to include(@model)
     expect(research_output.plan).to eq(@plan)
   end
+
+  private
+
+  # handles opening + closing of the modal, as well as the actions performed within the modal
+  def perform_modal_actions
+    # Open the modal
+    click_button 'Add a repository'
+    expect(page).to have_text('Repository search')
+
+    within('#modal-search-repositories') do
+      # Search for the Repository
+      fill_in 'research_output_search_term',	with: @model.name
+      click_button 'Apply filter(s)'
+      expect(page).to have_text(@model.description)
+      # Select the repository and make sure it no longer appears in the search results
+      click_link 'Select'
+      expect(page).not_to have_text(@model.description)
+
+      # Using JS to click on button, as click_button '.modal-header button.btn-close' did not work.
+      modal_close_button = find('.modal-header button.btn-close')
+      # Close the modal
+      execute_script('arguments[0].click();', modal_close_button)
+    end
+    # Verify that the selection was added to the main page's dom
+    expect(page).not_to have_text('Repository search')
+    expect(page).to have_text(@model.description)
+  end
 end