Merge pull request #1730 from antstorm/support-for-argument-matchers

Add support for ActiveJob argument matchers

Author: Sam Phippen

lib/rspec/rails/matchers/active_job.rb

@@ -97,7 +97,7 @@ def supports_block_expectations?
 
           def check(jobs)
             @matching_jobs, @unmatching_jobs = jobs.partition do |job|
-              if serialized_attributes.all? { |key, value| value == job[key] }
+              if arguments_match?(job) && other_attributes_match?(job)
                 args = ::ActiveJob::Arguments.deserialize(job[:args])
                 @block.call(*args)
                 true
@@ -134,9 +134,21 @@ def base_job_message(job)
             end
           end
 
+          def arguments_match?(job)
+            if @args.any?
+              deserialized_args = ::ActiveJob::Arguments.deserialize(job[:args])
+              RSpec::Mocks::ArgumentListMatcher.new(*@args).args_match?(*deserialized_args)
+            else
+              true
+            end
+          end
+
+          def other_attributes_match?(job)
+            serialized_attributes.all? { |key, value| value == job[key] }
+          end
+
           def serialized_attributes
             {}.tap do |attributes|
-              attributes[:args]  = ::ActiveJob::Arguments.serialize(@args) if @args.any?
               attributes[:at]    = @at.to_f if @at
               attributes[:queue] = @queue if @queue
               attributes[:job]   = @job if @job

spec/rspec/rails/matchers/active_job_spec.rb

@@ -209,6 +209,12 @@ def perform; end
       }.to have_enqueued_job.with(global_id_object)
     end
 
+    it "passes with provided argument matchers" do
+      expect {
+        hello_job.perform_later(42, "David")
+      }.to have_enqueued_job.with(instance_of(Fixnum), instance_of(String))
+    end
+
     it "generates failure message with all provided options" do
       date = Date.tomorrow.noon
       message = "expected to enqueue exactly 2 jobs, with [42], on queue low, at #{date}, but enqueued 0" + \