From bdbb25d3e2ab4a7d633ed226f2e64ed5f28985cb Mon Sep 17 00:00:00 2001 From: Johannes Haass Date: Mon, 17 Mar 2025 10:11:27 +0100 Subject: [PATCH] Ensure generic enqueuer is reset correctly --- spec/unit/jobs/generic_enqueuer_spec.rb | 2 +- spec/unit/jobs/reoccurring_job_spec.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/unit/jobs/generic_enqueuer_spec.rb b/spec/unit/jobs/generic_enqueuer_spec.rb index d4483fe4d4a..31b8ef90cb6 100644 --- a/spec/unit/jobs/generic_enqueuer_spec.rb +++ b/spec/unit/jobs/generic_enqueuer_spec.rb @@ -21,7 +21,7 @@ def perform before do # Reset singleton instance to ensure clean tests - Thread.current[:generic_enqueuer] = nil + GenericEnqueuer.reset! end describe '.shared' do diff --git a/spec/unit/jobs/reoccurring_job_spec.rb b/spec/unit/jobs/reoccurring_job_spec.rb index ad58da0dfcc..007985a2a14 100644 --- a/spec/unit/jobs/reoccurring_job_spec.rb +++ b/spec/unit/jobs/reoccurring_job_spec.rb @@ -73,6 +73,8 @@ def perform it 'keeps the delayed job\'s priority when re-enqueuing' do TestConfig.config[:jobs][:priorities] = { 'fake-job': 20 } + Jobs::GenericEnqueuer.reset! # Ensure no previous state interferes + pollable_job = Jobs::Enqueuer.new({ queue: Jobs::Queues.generic, priority: 22 }).enqueue_pollable(FakeJob.new) expect(Delayed::Job.where(guid: PollableJobModel.first.delayed_job_guid).first[:priority]).to eq(42)