Simplify the have_enqueued_job implementation

Author: pirj

lib/rspec/rails/matchers/active_job.rb

@@ -230,26 +230,11 @@ def initialize(job)
           def matches?(proc)
             raise ArgumentError, "have_enqueued_job and enqueue_job only support block expectations" unless Proc === proc
 
-            original_enqueued_jobs_hashes = queue_adapter.enqueued_jobs.map(&:hash)
-
+            original_enqueued_jobs = Set.new(queue_adapter.enqueued_jobs)
             proc.call
+            enqueued_jobs = Set.new(queue_adapter.enqueued_jobs)
 
-            in_block_jobs = queue_adapter.enqueued_jobs.each_with_object({}) do |job, jobs|
-              jobs[job.hash] ||= { job: job, count: 0 }
-              jobs[job.hash][:count] += 1
-            end
-
-            original_enqueued_jobs_hashes.each do |job_hash|
-              in_block_jobs[job_hash][:count] -= 1 if in_block_jobs.key?(job_hash)
-            end
-
-            in_block_jobs = in_block_jobs.each_value.flat_map do |job_and_count|
-              count, job = job_and_count.values_at(:count, :job)
-
-              Array.new(count, job) if count.positive?
-            end
-
-            check(in_block_jobs.compact)
+            check(enqueued_jobs - original_enqueued_jobs)
           end
 
           def does_not_match?(proc)

spec/rspec/rails/matchers/active_job_spec.rb

@@ -101,24 +101,22 @@ def self.name; "LoggingJob"; end
     context "when job is retried" do
       include ActiveJob::TestHelper
 
-      let(:retried_job) do
+      let(:unreliable_job) do
         Class.new(ActiveJob::Base) do
           retry_on StandardError, wait: 5, queue: :retry
 
-          def self.name; "RetriedJob"; end
+          def self.name; "UnreliableJob"; end
           def perform; raise StandardError; end
         end
       end
 
-      before do
-        stub_const("RetriedJob", retried_job)
-        queue_adapter.perform_enqueued_jobs = true
-      end
+      before { stub_const("UnreliableJob", unreliable_job) }
 
       it "passes with reenqueued job" do
         time = Time.current.change(usec: 0)
         travel_to time do
-          expect  { retried_job.perform_later }.to have_enqueued_job(retried_job).on_queue(:retry).at(time + 5)
+          UnreliableJob.perform_later
+          expect { perform_enqueued_jobs }.to have_enqueued_job(UnreliableJob).on_queue(:retry).at(time + 5)
         end
       end
     end