Merge pull request #4443 from nhsuk/refactor-import-tests

thomasleese · web-flow · commit 385ea37a0d2f · 2025-08-29T12:38:19.000+01:00
diff --git a/spec/features/e2e_journey_spec.rb b/spec/features/e2e_journey_spec.rb
@@ -115,12 +115,7 @@ def when_i_upload_the_cohort_import_containing_one_child
     click_on "Continue"
     attach_file "cohort_import[csv]", csv_file.path
     click_on "Continue"
-
-    perform_enqueued_jobs(only: ProcessImportJob)
-    perform_enqueued_jobs(only: ProcessPatientChangesetsJob)
-    perform_enqueued_jobs(only: CommitPatientChangesetsJob)
-
-    visit cohort_import_path(CohortImport.last)
+    wait_for_import_to_complete(CohortImport)
   end
 
   def then_i_see_that_the_cohort_has_been_uploaded
diff --git a/spec/features/hpv_vaccination_offline_spec.rb b/spec/features/hpv_vaccination_offline_spec.rb
@@ -365,11 +365,7 @@ def and_i_upload_the_modified_csv_file
     attach_file("immunisation_import[csv]", "tmp/modified.csv")
     click_on "Continue"
 
-    perform_enqueued_jobs(only: ProcessImportJob)
-    perform_enqueued_jobs(only: ProcessPatientChangesetsJob)
-    perform_enqueued_jobs(only: CommitPatientChangesetsJob)
-
-    click_link ImmunisationImport.last.created_at.to_fs(:long), match: :first
+    wait_for_import_to_complete(ImmunisationImport)
   end
 
   def when_i_navigate_to_the_session_page
diff --git a/spec/features/import_child_pds_lookup_extravaganza_spec.rb b/spec/features/import_child_pds_lookup_extravaganza_spec.rb
@@ -424,15 +424,7 @@ def and_i_upload_import_file(filename)
     click_button "Continue"
     attach_file("cohort_import[csv]", "spec/fixtures/cohort_import/#{filename}")
     click_on "Continue"
-
-    perform_enqueued_jobs(only: ProcessImportJob)
-    perform_enqueued_jobs(only: ProcessPatientChangesetsJob)
-    perform_enqueued_jobs(only: CommitPatientChangesetsJob)
-
-    # TODO: Hack to make sure all the steps are processed.
-    10.times { perform_enqueued_jobs }
-
-    visit cohort_import_path(CohortImport.last)
+    wait_for_import_to_complete(CohortImport)
   end
 
   def when_i_visit_a_session_page_for_the_hpv_programme
@@ -463,13 +455,7 @@ def when_i_upload_a_valid_file
       "spec/fixtures/class_import/pds_extravaganza.csv"
     )
     click_on "Continue"
-
-    perform_enqueued_jobs(only: ProcessImportJob)
-    perform_enqueued_jobs(only: ProcessPatientChangesetsJob)
-    perform_enqueued_jobs(only: CommitPatientChangesetsJob)
-
-    click_link ClassImport.order(:created_at).last.created_at.to_fs(:long),
-               match: :first
+    wait_for_import_to_complete(ClassImport)
   end
 
   def when_i_visit_the_import_page
diff --git a/spec/features/import_child_records_preparation_spec.rb b/spec/features/import_child_records_preparation_spec.rb
@@ -280,12 +280,7 @@ def then_i_should_see_the_import_page
   def when_i_upload_a_valid_file
     attach_file("cohort_import[csv]", "spec/fixtures/cohort_import/valid.csv")
     click_on "Continue"
-
-    perform_enqueued_jobs(only: ProcessImportJob)
-    perform_enqueued_jobs(only: ProcessPatientChangesetsJob)
-    perform_enqueued_jobs(only: CommitPatientChangesetsJob)
-
-    click_link CohortImport.last.created_at.to_fs(:long), match: :first
+    wait_for_import_to_complete(CohortImport)
   end
 
   def then_i_should_see_the_patients
diff --git a/spec/features/import_child_records_slow_spec.rb b/spec/features/import_child_records_slow_spec.rb
diff --git a/spec/features/import_child_records_spec.rb b/spec/features/import_child_records_spec.rb
@@ -192,12 +192,7 @@ def then_i_should_see_the_import_page
   def and_i_upload_a_valid_file
     attach_file("cohort_import[csv]", "spec/fixtures/cohort_import/valid.csv")
     click_on "Continue"
-
-    perform_enqueued_jobs(only: ProcessImportJob)
-    perform_enqueued_jobs(only: ProcessPatientChangesetsJob)
-    perform_enqueued_jobs(only: CommitPatientChangesetsJob)
-
-    click_link CohortImport.last.created_at.to_fs(:long), match: :first
+    wait_for_import_to_complete(CohortImport)
   end
 
   def and_i_should_see_the_patients
@@ -359,12 +354,7 @@ def when_i_upload_a_valid_file_with_changes
       "spec/fixtures/cohort_import/valid_with_changes.csv"
     )
     click_on "Continue"
-
-    perform_enqueued_jobs(only: ProcessImportJob)
-    perform_enqueued_jobs(only: ProcessPatientChangesetsJob)
-    perform_enqueued_jobs(only: CommitPatientChangesetsJob)
-
-    click_link CohortImport.last.created_at.to_fs(:long), match: :first
+    wait_for_import_to_complete(CohortImport)
   end
 
   def and_i_go_to_the_import_page
diff --git a/spec/features/import_child_records_with_duplicates_spec.rb b/spec/features/import_child_records_with_duplicates_spec.rb
@@ -216,12 +216,7 @@ def and_i_start_adding_children_to_the_cohort
   def and_i_upload_a_file_with_duplicate_records
     attach_file("cohort_import[csv]", "spec/fixtures/cohort_import/valid.csv")
     click_on "Continue"
-
-    perform_enqueued_jobs(only: ProcessImportJob)
-    perform_enqueued_jobs(only: ProcessPatientChangesetsJob)
-    perform_enqueued_jobs(only: CommitPatientChangesetsJob)
-
-    click_link CohortImport.last.created_at.to_fs(:long), match: :first
+    wait_for_import_to_complete(CohortImport)
   end
 
   def then_i_should_see_the_import_page_with_duplicate_records
diff --git a/spec/features/import_child_records_with_twins_spec.rb b/spec/features/import_child_records_with_twins_spec.rb
@@ -100,12 +100,7 @@ def and_i_start_adding_children_to_the_cohort
   def and_i_upload_a_file_with_a_twin
     attach_file("cohort_import[csv]", "spec/fixtures/cohort_import/valid.csv")
     click_on "Continue"
-
-    perform_enqueued_jobs(only: ProcessImportJob)
-    perform_enqueued_jobs(only: ProcessPatientChangesetsJob)
-    perform_enqueued_jobs(only: CommitPatientChangesetsJob)
-
-    visit cohort_import_path(CohortImport.last)
+    wait_for_import_to_complete(CohortImport)
   end
 
   def then_i_should_see_the_import_page_with_successful_import
diff --git a/spec/features/import_class_lists_move_spec.rb b/spec/features/import_class_lists_move_spec.rb
@@ -152,12 +152,7 @@ def then_i_should_see_the_import_page
   def when_i_upload_a_valid_file
     attach_file("class_import[csv]", "spec/fixtures/class_import/valid.csv")
     click_on "Continue"
-
-    perform_enqueued_jobs(only: ProcessImportJob)
-    perform_enqueued_jobs(only: ProcessPatientChangesetsJob)
-    perform_enqueued_jobs(only: CommitPatientChangesetsJob)
-
-    visit class_import_path(ClassImport.last)
+    wait_for_import_to_complete(ClassImport)
   end
 
   alias_method :and_i_upload_a_valid_file, :when_i_upload_a_valid_file
diff --git a/spec/features/import_class_lists_spec.rb b/spec/features/import_class_lists_spec.rb
@@ -163,12 +163,7 @@ def and_i_upload_a_valid_file
     attach_file("class_import[csv]", "spec/fixtures/class_import/valid.csv")
     click_on "Continue"
 
-    perform_enqueued_jobs(only: ProcessImportJob)
-    perform_enqueued_jobs(only: ProcessPatientChangesetsJob)
-    perform_enqueued_jobs(only: CommitPatientChangesetsJob)
-
-    click_link ClassImport.order(:created_at).last.created_at.to_fs(:long),
-               match: :first
+    wait_for_import_to_complete(ClassImport)
   end
 
   def then_i_should_see_the_patients
diff --git a/spec/features/import_class_lists_with_duplicates_spec.rb b/spec/features/import_class_lists_with_duplicates_spec.rb
@@ -204,12 +204,7 @@ def and_i_upload_a_file_with_duplicate_records
       "spec/fixtures/class_import/duplicates.csv"
     )
     click_on "Continue"
-
-    perform_enqueued_jobs(only: ProcessImportJob)
-    perform_enqueued_jobs(only: ProcessPatientChangesetsJob)
-    perform_enqueued_jobs(only: CommitPatientChangesetsJob)
-
-    click_link ClassImport.last.created_at.to_fs(:long), match: :first
+    wait_for_import_to_complete(ClassImport)
   end
 
   def then_i_should_see_the_import_page_with_duplicate_records
diff --git a/spec/features/import_vaccination_records_spec.rb b/spec/features/import_vaccination_records_spec.rb
@@ -95,12 +95,7 @@ def when_i_upload_an_invalid_file
       "spec/fixtures/immunisation_import/invalid_rows.csv"
     )
     click_on "Continue"
-
-    perform_enqueued_jobs(only: ProcessImportJob)
-    perform_enqueued_jobs(only: ProcessPatientChangesetsJob)
-    perform_enqueued_jobs(only: CommitPatientChangesetsJob)
-
-    visit immunisation_import_path(ImmunisationImport.last)
+    wait_for_import_to_complete(ImmunisationImport)
   end
 
   def then_i_should_see_the_errors_page
@@ -128,12 +123,7 @@ def and_i_upload_a_valid_file
       "spec/fixtures/immunisation_import/valid_hpv.csv"
     )
     click_on "Continue"
-
-    perform_enqueued_jobs(only: ProcessImportJob)
-    perform_enqueued_jobs(only: ProcessPatientChangesetsJob)
-    perform_enqueued_jobs(only: CommitPatientChangesetsJob)
-
-    visit immunisation_import_path(ImmunisationImport.order(:created_at).last)
+    wait_for_import_to_complete(ImmunisationImport)
   end
 
   def then_i_should_see_the_success_heading
diff --git a/spec/features/import_vaccination_records_with_duplicates_spec.rb b/spec/features/import_vaccination_records_with_duplicates_spec.rb
@@ -149,12 +149,7 @@ def and_i_upload_a_file_with_duplicate_records
       "spec/fixtures/immunisation_import/valid_hpv.csv"
     )
     click_on "Continue"
-
-    perform_enqueued_jobs(only: ProcessImportJob)
-    perform_enqueued_jobs(only: ProcessPatientChangesetsJob)
-    perform_enqueued_jobs(only: CommitPatientChangesetsJob)
-
-    visit immunisation_import_path(ImmunisationImport.last)
+    wait_for_import_to_complete(ImmunisationImport)
   end
 
   def then_i_should_see_the_import_page_with_duplicate_records
diff --git a/spec/features/triage_partially_vaccinated_spec.rb b/spec/features/triage_partially_vaccinated_spec.rb
@@ -65,9 +65,7 @@ def and_i_upload_historical_vaccination_records
     )
     click_on "Continue"
 
-    perform_enqueued_jobs(only: ProcessImportJob)
-
-    click_link ImmunisationImport.last.created_at.to_fs(:long), match: :first
+    wait_for_import_to_complete(ImmunisationImport)
   end
 
   def then_i_see_the_completed_upload
@@ -90,11 +88,7 @@ def and_i_upload_the_class_list
     attach_file("class_import[csv]", file_fixture("td_ipv/class_list.csv"))
     click_on "Continue"
 
-    perform_enqueued_jobs(only: ProcessImportJob)
-    perform_enqueued_jobs(only: ProcessPatientChangesetsJob)
-    perform_enqueued_jobs(only: CommitPatientChangesetsJob)
-
-    click_link ClassImport.last.created_at.to_fs(:long), match: :first
+    wait_for_import_to_complete(ClassImport)
   end
 
   def then_i_see_one_patient_needing_consent
diff --git a/spec/fixtures/cohort_import/valid_1000_rows.csv b/spec/fixtures/cohort_import/valid_1000_rows.csv
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
diff --git a/spec/support/imports_helper.rb b/spec/support/imports_helper.rb
