From de4420da44ecce68a6b7607b828c69959a5f738e Mon Sep 17 00:00:00 2001
From: bogdanvlviv <bogdanvlviv@gmail.com>
Date: Thu, 16 Aug 2018 19:49:14 +0300
Subject: Allow `:queue` option to `assert_no_performed_jobs`.

If the `:queue` option is specified, then only the job(s) enqueued to a specific
queue will not be performed.

Example:
```
def test_assert_no_performed_jobs_with_queue_option
  assert_no_performed_jobs queue: :some_queue do
    HelloJob.set(queue: :other_queue).perform_later("jeremy")
  end
end
```
---
 activejob/lib/active_job/test_helper.rb  | 13 ++++++--
 activejob/test/cases/test_helper_test.rb | 54 ++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/activejob/lib/active_job/test_helper.rb b/activejob/lib/active_job/test_helper.rb
index 3be74e504b..4dae1a9969 100644
--- a/activejob/lib/active_job/test_helper.rb
+++ b/activejob/lib/active_job/test_helper.rb
@@ -297,11 +297,20 @@ module ActiveJob
     #     end
     #   end
     #
+    # If the +:queue+ option is specified,
+    # then only the job(s) enqueued to a specific queue will not be performed.
+    #
+    #   def test_assert_no_performed_jobs_with_queue_option
+    #     assert_no_performed_jobs queue: :some_queue do
+    #       HelloJob.set(queue: :other_queue).perform_later("jeremy")
+    #     end
+    #   end
+    #
     # Note: This assertion is simply a shortcut for:
     #
     #   assert_performed_jobs 0, &block
-    def assert_no_performed_jobs(only: nil, except: nil, &block)
-      assert_performed_jobs 0, only: only, except: except, &block
+    def assert_no_performed_jobs(only: nil, except: nil, queue: nil, &block)
+      assert_performed_jobs 0, only: only, except: except, queue: queue, &block
     end
 
     # Asserts that the job has been enqueued with the given arguments.
diff --git a/activejob/test/cases/test_helper_test.rb b/activejob/test/cases/test_helper_test.rb
index 8287001d7c..eade285412 100644
--- a/activejob/test/cases/test_helper_test.rb
+++ b/activejob/test/cases/test_helper_test.rb
@@ -1170,6 +1170,60 @@ class PerformedJobsTest < ActiveJob::TestCase
     assert_match(/`:only` and `:except`/, error.message)
   end
 
+  def test_assert_no_performed_jobs_with_queue_option
+    assert_no_performed_jobs queue: :some_queue do
+      HelloJob.set(queue: :other_queue).perform_later("jeremy")
+    end
+  end
+
+  def test_assert_no_performed_jobs_with_queue_option_failure
+    error = assert_raise ActiveSupport::TestCase::Assertion do
+      assert_no_performed_jobs queue: :some_queue do
+        HelloJob.set(queue: :some_queue).perform_later("jeremy")
+      end
+    end
+
+    assert_match(/0 .* but 1/, error.message)
+  end
+
+  def test_assert_no_performed_jobs_with_only_and_queue_options
+    assert_no_performed_jobs only: HelloJob, queue: :some_queue do
+      HelloJob.set(queue: :other_queue).perform_later("bogdan")
+      LoggingJob.set(queue: :some_queue).perform_later("jeremy")
+    end
+  end
+
+  def test_assert_no_performed_jobs_with_only_and_queue_options_failure
+    error = assert_raise ActiveSupport::TestCase::Assertion do
+      assert_no_performed_jobs only: HelloJob, queue: :some_queue do
+        HelloJob.set(queue: :some_queue).perform_later("bogdan")
+        LoggingJob.set(queue: :some_queue).perform_later("jeremy")
+      end
+    end
+
+    assert_match(/0 .* but 1/, error.message)
+  end
+
+  def test_assert_no_performed_jobs_with_except_and_queue_options
+    assert_no_performed_jobs except: HelloJob, queue: :some_queue do
+      HelloJob.set(queue: :other_queue).perform_later("bogdan")
+      HelloJob.set(queue: :some_queue).perform_later("bogdan")
+      LoggingJob.set(queue: :other_queue).perform_later("jeremy")
+    end
+  end
+
+  def test_assert_no_performed_jobs_with_except_and_queue_options_failure
+    error = assert_raise ActiveSupport::TestCase::Assertion do
+      assert_no_performed_jobs except: HelloJob, queue: :some_queue do
+        HelloJob.set(queue: :other_queue).perform_later("bogdan")
+        HelloJob.set(queue: :some_queue).perform_later("bogdan")
+        LoggingJob.set(queue: :some_queue).perform_later("jeremy")
+      end
+    end
+
+    assert_match(/0 .* but 1/, error.message)
+  end
+
   def test_assert_performed_job
     assert_performed_with(job: NestedJob, queue: "default") do
       NestedJob.perform_later
-- 
cgit v1.2.3