lib/active_job/test_helper.rb in activejob-4.2.0 vs lib/active_job/test_helper.rb in activejob-4.2.1.rc1

@@ -1,5 +1,7 @@
+require 'active_support/core_ext/hash/keys'
+
 module ActiveJob
   # Provides helper methods for testing Active Job
   module TestHelper
     extend ActiveSupport::Concern
 
@@ -155,13 +157,14 @@
       #   end
       def assert_enqueued_with(args = {}, &_block)
         original_enqueued_jobs = enqueued_jobs.dup
         clear_enqueued_jobs
         args.assert_valid_keys(:job, :args, :at, :queue)
+        serialized_args = serialize_args_for_assertion(args)
         yield
         matching_job = enqueued_jobs.any? do |job|
-          args.all? { |key, value| value == job[key] }
+          serialized_args.all? { |key, value| value == job[key] }
         end
         assert matching_job, "No enqueued job found with #{args}"
       ensure
         queue_adapter.enqueued_jobs = original_enqueued_jobs + enqueued_jobs
       end
@@ -175,13 +178,14 @@
       #   end
       def assert_performed_with(args = {}, &_block)
         original_performed_jobs = performed_jobs.dup
         clear_performed_jobs
         args.assert_valid_keys(:job, :args, :at, :queue)
+        serialized_args = serialize_args_for_assertion(args)
         perform_enqueued_jobs { yield }
         matching_job = performed_jobs.any? do |job|
-          args.all? { |key, value| value == job[key] }
+          serialized_args.all? { |key, value| value == job[key] }
         end
         assert matching_job, "No performed job found with #{args}"
       ensure
         queue_adapter.performed_jobs = original_performed_jobs + performed_jobs
       end
@@ -210,9 +214,17 @@
           enqueued_jobs.clear
         end
 
         def clear_performed_jobs
           performed_jobs.clear
+        end
+
+        def serialize_args_for_assertion(args)
+          serialized_args = args.dup
+          if job_args = serialized_args.delete(:args)
+            serialized_args[:args] = ActiveJob::Arguments.serialize(job_args)
+          end
+          serialized_args
         end
     end
   end
 end