Merge pull request #21852 from morgoth/support-array-in-assert_enqueued_jobs-for-only-option

Support passing array to `assert_enqueued_jobs` in `:only` option

3 files changed, 23 insertions, 1 deletions

diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md
index b5742191eb..988815fee2 100644
--- a/activejob/CHANGELOG.md
+++ b/activejob/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Support passing array to `assert_enqueued_jobs` in `:only` option.
+
+    *Wojciech Wnętrzak*
+
 *   Add job priorities to Active Job.
 
     *wvengen*
diff --git a/activejob/lib/active_job/test_helper.rb b/activejob/lib/active_job/test_helper.rb
index 476d681eed..666e984fe0 100644
--- a/activejob/lib/active_job/test_helper.rb
+++ b/activejob/lib/active_job/test_helper.rb
@@ -300,7 +300,7 @@ module ActiveJob
 
         def enqueued_jobs_size(only: nil) # :nodoc:
           if only
-            enqueued_jobs.select { |job| job.fetch(:job) == only }.size
+            enqueued_jobs.select { |job| Array(only).include?(job.fetch(:job)) }.size
           else
             enqueued_jobs.size
           end
diff --git a/activejob/test/cases/test_helper_test.rb b/activejob/test/cases/test_helper_test.rb
index 8c60f037d2..18cf35562b 100644
--- a/activejob/test/cases/test_helper_test.rb
+++ b/activejob/test/cases/test_helper_test.rb
@@ -140,6 +140,16 @@ class EnqueuedJobsTest < ActiveJob::TestCase
     assert_match(/1 .* but 2/, error.message)
   end
 
+  def test_assert_enqueued_jobs_with_only_option_as_array
+    assert_nothing_raised do
+      assert_enqueued_jobs 2, only: [HelloJob, LoggingJob] do
+        HelloJob.perform_later('jeremy')
+        LoggingJob.perform_later('stewie')
+        RescueJob.perform_later('david')
+      end
+    end
+  end
+
   def test_assert_no_enqueued_jobs_with_only_option
     assert_nothing_raised do
       assert_no_enqueued_jobs only: HelloJob do
@@ -159,6 +169,14 @@ class EnqueuedJobsTest < ActiveJob::TestCase
     assert_match(/0 .* but 1/, error.message)
   end
 
+  def test_assert_no_enqueued_jobs_with_only_option_as_array
+    assert_nothing_raised do
+      assert_no_enqueued_jobs only: [HelloJob, RescueJob] do
+        LoggingJob.perform_later
+      end
+    end
+  end
+
   def test_assert_enqueued_job
     assert_enqueued_with(job: LoggingJob, queue: 'default') do
       LoggingJob.set(wait_until: Date.tomorrow.noon).perform_later