Merge pull request #4831 from nhsuk/rename-wait-for-jobs-to-finish

Rename `wait_for_jobs_to_finish`

Author: thomasleese

spec/jobs/pds_cascading_search_job_spec.rb

@@ -127,7 +127,7 @@
       it "skips wildcard name steps and completes search" do
         described_class.perform_now(patient_changeset)
 
-        wait_for_jobs_to_finish(described_class.to_s)
+        perform_enqueued_jobs_while_exists(only: described_class)
         perform_enqueued_jobs(only: ProcessPatientChangesetJob)
 
         patient_changeset.reload

spec/support/imports_helper.rb

@@ -4,8 +4,8 @@ module ImportsHelper
   def wait_for_import_to_complete(import_class)
     perform_enqueued_jobs(only: ProcessImportJob)
 
-    wait_for_jobs_to_finish("PDSCascadingSearchJob")
-    wait_for_jobs_to_finish("ProcessPatientChangesetJob")
+    perform_enqueued_jobs_while_exists(only: PDSCascadingSearchJob)
+    perform_enqueued_jobs_while_exists(only: ProcessPatientChangesetJob)
 
     perform_enqueued_jobs(only: CommitPatientChangesetsJob)
     click_on_most_recent_import(import_class)
@@ -16,10 +16,12 @@ def click_on_most_recent_import(import_class)
              match: :first
   end
 
-  def wait_for_jobs_to_finish(job_class)
+  def perform_enqueued_jobs_while_exists(only:)
+    job_class = only.name
+
     # rubocop:disable Style/WhileUntilModifier
     while enqueued_jobs.any? { it["job_class"] == job_class }
-      perform_enqueued_jobs(only: job_class.constantize)
+      perform_enqueued_jobs(only:)
     end
     # rubocop:enable Style/WhileUntilModifier
   end