Add back the support to pass at as a proc in the job assertions

Author: rafaelfranca

activejob/lib/active_job/test_helper.rb

@@ -351,9 +351,21 @@ def assert_no_performed_jobs(only: nil, except: nil, queue: nil, &block)
     #     assert_enqueued_with(job: MyJob, at: Date.tomorrow.noon)
     #   end
     #
+    # The +at+ and +args+ arguments also accept a proc.
     #
-    # The +args+ argument also accepts a proc which will get passed the actual
-    # job's arguments. Your proc needs to return a boolean value determining if
+    # To the +at+ proc, it will get passed the actual job's at argument.
+    #
+    #   def test_assert_enqueued_with
+    #     expected_time = ->(at) do
+    #       (Date.yesterday..Date.tomorrow).cover?(at)
+    #     end
+    #
+    #     MyJob.set(at: Date.today.noon).perform_later
+    #     assert_enqueued_with(job: MyJob, at: expected_time)
+    #   end
+    #
+    # To the +args+ proc, it will get passed the actual job's arguments
+    # Your proc needs to return a boolean value determining if
     # the job's arguments matches your expectation. This is useful to check only
     # for a subset of arguments.
     #
@@ -366,7 +378,6 @@ def assert_no_performed_jobs(only: nil, except: nil, queue: nil, &block)
     #     assert_enqueued_with(job: MyJob, args: expected_args, queue: 'low')
     #   end
     #
-    #
     # If a block is passed, asserts that the block will cause the job to be
     # enqueued with the given arguments.
     #
@@ -425,8 +436,21 @@ def assert_enqueued_with(job: nil, args: nil, at: nil, queue: nil)
     #     assert_performed_with(job: MyJob, at: Date.tomorrow.noon)
     #   end
     #
-    # The +args+ argument also accepts a proc which will get passed the actual
-    # job's arguments. Your proc needs to return a boolean value determining if
+    # The +at+ and +args+ arguments also accept a proc.
+    #
+    # To the +at+ proc, it will get passed the actual job's at argument.
+    #
+    #   def test_assert_enqueued_with
+    #     expected_time = ->(at) do
+    #       (Date.yesterday..Date.tomorrow).cover?(at)
+    #     end
+    #
+    #     MyJob.set(at: Date.today.noon).perform_later
+    #     assert_enqueued_with(job: MyJob, at: expected_time)
+    #   end
+    #
+    # To the +args+ proc, it will get passed the actual job's arguments
+    # Your proc needs to return a boolean value determining if
     # the job's arguments matches your expectation. This is useful to check only
     # for a subset of arguments.
     #
@@ -630,7 +654,7 @@ def flush_enqueued_jobs(only: nil, except: nil, queue: nil)
 
       def prepare_args_for_assertion(args)
         args.dup.tap do |arguments|
-          if arguments[:at]
+          if arguments[:at] && !arguments[:at].respond_to?(:call)
             at_range = arguments[:at] - 1..arguments[:at] + 1
             arguments[:at] = ->(at) { at_range.cover?(at) }
           end

activejob/test/cases/test_helper_test.rb

@@ -1704,6 +1704,18 @@ def test_assert_performed_with_with_relative_at_option
     end
   end
 
+  def test_assert_performed_with_with_at_option_as_a_proc
+    assert_performed_with(job: HelloJob, at: ->(at) { (4.minutes.from_now..6.minutes.from_now).cover?(at) }) do
+      HelloJob.set(wait: 5.minutes).perform_later
+    end
+
+    assert_raise ActiveSupport::TestCase::Assertion do
+      assert_performed_with(job: HelloJob, at: ->(at) { (1.minute.from_now..3.minutes.from_now).cover?(at) }) do
+        HelloJob.set(wait: 1.minute).perform_later
+      end
+    end
+  end
+
   def test_assert_performed_with_without_block_with_at_option
     HelloJob.set(wait_until: Date.tomorrow.noon).perform_later