Fixed deserialization of passed arguments to with block in AJ matcher (#1684)

Author: morgoth

lib/rspec/rails/matchers/active_job.rb

@@ -91,7 +91,8 @@ def supports_block_expectations?
           def check(jobs)
             @matching_jobs_count = jobs.count do |job|
               if serialized_attributes.all? { |key, value| value == job[key] }
-                @block.call(*job[:args])
+                args = ::ActiveJob::Arguments.deserialize(job[:args])
+                @block.call(*args)
                 true
               else
                 false

spec/rspec/rails/matchers/active_job_spec.rb

@@ -1,7 +1,30 @@
 require "spec_helper"
 require "rspec/rails/feature_check"
+
 if RSpec::Rails::FeatureCheck.has_active_job?
   require "rspec/rails/matchers/active_job"
+
+  class GlobalIdModel
+    include GlobalID::Identification
+
+    attr_reader :id
+
+    def self.find(id)
+      new(id)
+    end
+
+    def initialize(id)
+      @id = id
+    end
+
+    def ==(comparison_object)
+      id == comparison_object.id
+    end
+
+    def to_global_id(options = {})
+      @global_id ||= GlobalID.create(self, :app => "rspec-suite")
+    end
+  end
 end
 
 RSpec.describe "ActiveJob matchers", :skip => !RSpec::Rails::FeatureCheck.has_active_job? do
@@ -26,30 +49,6 @@ def perform; end
     end
   end
 
-  let(:global_id_model) do
-    Class.new do
-      include GlobalID::Identification
-
-      attr_reader :id
-
-      def self.find(id)
-        new(id)
-      end
-
-      def self.name
-        "AnonymousClass"
-      end
-
-      def initialize(id)
-        @id = id
-      end
-
-      def to_global_id(options = {})
-        @global_id ||= GlobalID.create(self, :app => "rspec-suite")
-      end
-    end
-  end
-
   before do
     ActiveJob::Base.queue_adapter = :test
   end
@@ -196,7 +195,7 @@ def to_global_id(options = {})
     end
 
     it "passes with provided arguments containing global id object" do
-      global_id_object = global_id_model.new(42)
+      global_id_object = GlobalIdModel.new("42")
 
       expect {
         hello_job.perform_later(global_id_object)
@@ -247,6 +246,17 @@ def to_global_id(options = {})
       }
     end
 
+    it "passess deserialized arguments to with block" do
+      global_id_object = GlobalIdModel.new("42")
+
+      expect {
+        hello_job.perform_later(global_id_object, :symbolized_key => "asdf")
+      }.to have_enqueued_job(hello_job).with { |first_arg, second_arg|
+        expect(first_arg).to eq(global_id_object)
+        expect(second_arg).to eq({:symbolized_key => "asdf"})
+      }
+    end
+
     it "only calls with block if other conditions are met" do
       noon = Date.tomorrow.noon
       midnight = Date.tomorrow.midnight