From 8f2dc2d175664309ae398f9e9c9dee50a032a993 Mon Sep 17 00:00:00 2001 From: Zeke Gabrielse Date: Mon, 27 May 2024 10:43:12 -0500 Subject: [PATCH] remove sidekiq-unique-jobs --- Gemfile | 1 - Gemfile.lock | 5 --- app/workers/create_webhook_events_worker.rb | 3 +- app/workers/cull_dead_machines_worker.rb | 1 - app/workers/cull_dead_processes_worker.rb | 1 - app/workers/event_log_worker.rb | 3 +- app/workers/event_notification_worker.rb | 3 +- app/workers/license_expirations_worker.rb | 1 - .../license_overdue_check_ins_worker.rb | 1 - app/workers/machine_heartbeat_worker.rb | 7 +---- app/workers/process_heartbeat_worker.rb | 7 +---- app/workers/prune_event_logs_worker.rb | 1 - app/workers/prune_expired_tokens_worker.rb | 1 - app/workers/prune_metrics_worker.rb | 1 - .../prune_release_download_links_worker.rb | 1 - .../prune_release_upgrade_links_worker.rb | 1 - app/workers/prune_request_logs_worker.rb | 1 - app/workers/prune_webhook_events_worker.rb | 1 - app/workers/request_limits_report_worker.rb | 1 - app/workers/touch_license_worker.rb | 7 +---- .../vacuum_analyze_event_logs_worker.rb | 1 - app/workers/vacuum_analyze_metrics_worker.rb | 1 - .../vacuum_analyze_request_logs_worker.rb | 1 - .../vacuum_analyze_webhook_events_worker.rb | 1 - app/workers/webhook_worker.rb | 1 - config/initializers/sidekiq.rb | 17 ---------- config/routes.rb | 1 - .../workers/cull_dead_machines_worker_spec.rb | 10 ++---- .../cull_dead_processes_worker_spec.rb | 10 ++---- .../license_expirations_worker_spec.rb | 8 ----- .../license_overdue_check_ins_worker_spec.rb | 8 ----- spec/workers/machine_heartbeat_worker_spec.rb | 31 ------------------- spec/workers/process_heartbeat_worker_spec.rb | 31 ------------------- spec/workers/prune_event_logs_worker_spec.rb | 10 ++---- .../workers/prune_request_logs_worker_spec.rb | 10 ++---- .../prune_webhook_events_worker_spec.rb | 10 ++---- 36 files changed, 16 insertions(+), 183 deletions(-) diff --git a/Gemfile b/Gemfile index 8f36640b40..5d8efe0a40 100644 --- a/Gemfile +++ b/Gemfile @@ -59,7 +59,6 @@ gem 'rails-pattern_matching' # Background jobs gem 'sidekiq', '~> 7.2.4' -gem 'sidekiq-unique-jobs', '~> 8.0.10' gem 'sidekiq-cron', '~> 1.12.0' gem 'sidekiq-cronitor', '~> 3.6.0' diff --git a/Gemfile.lock b/Gemfile.lock index 0e98157077..a1f00c5376 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -464,10 +464,6 @@ GEM sidekiq-cronitor (3.6.0) cronitor (~> 5.0) sidekiq (< 8) - sidekiq-unique-jobs (8.0.10) - concurrent-ruby (~> 1.0, >= 1.0.5) - sidekiq (>= 7.0.0, < 8.0.0) - thor (>= 1.0, < 3.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -571,7 +567,6 @@ DEPENDENCIES sidekiq (~> 7.2.4) sidekiq-cron (~> 1.12.0) sidekiq-cronitor (~> 3.6.0) - sidekiq-unique-jobs (~> 8.0.10) sprockets (~> 3.0) stackprof stripe (~> 5.43) diff --git a/app/workers/create_webhook_events_worker.rb b/app/workers/create_webhook_events_worker.rb index 81528acc83..18da00797b 100644 --- a/app/workers/create_webhook_events_worker.rb +++ b/app/workers/create_webhook_events_worker.rb @@ -1,8 +1,7 @@ # frozen_string_literal: true class CreateWebhookEventsWorker < BaseWorker - sidekiq_options queue: :webhooks, - lock: :until_executed + sidekiq_options queue: :webhooks def perform(event, account_id, payload, environment_id = nil) account = Rails.cache.fetch(Account.cache_key(account_id), skip_nil: true, expires_in: 15.minutes) do diff --git a/app/workers/cull_dead_machines_worker.rb b/app/workers/cull_dead_machines_worker.rb index c8b744e454..a612103234 100644 --- a/app/workers/cull_dead_machines_worker.rb +++ b/app/workers/cull_dead_machines_worker.rb @@ -2,7 +2,6 @@ class CullDeadMachinesWorker < BaseWorker sidekiq_options queue: :cron, - lock: :until_executed, lock_ttl: 10.minutes, on_conflict: :raise, cronitor_disabled: false def perform diff --git a/app/workers/cull_dead_processes_worker.rb b/app/workers/cull_dead_processes_worker.rb index ba2ec5361a..6d4f0bbdd0 100644 --- a/app/workers/cull_dead_processes_worker.rb +++ b/app/workers/cull_dead_processes_worker.rb @@ -2,7 +2,6 @@ class CullDeadProcessesWorker < BaseWorker sidekiq_options queue: :cron, - lock: :until_executed, lock_ttl: 10.minutes, on_conflict: :raise, cronitor_disabled: false def perform diff --git a/app/workers/event_log_worker.rb b/app/workers/event_log_worker.rb index e66db1b87a..7ddfbc848e 100644 --- a/app/workers/event_log_worker.rb +++ b/app/workers/event_log_worker.rb @@ -1,8 +1,7 @@ # frozen_string_literal: true class EventLogWorker < BaseWorker - sidekiq_options lock: :until_executed, - queue: :logs + sidekiq_options queue: :logs def perform( event, diff --git a/app/workers/event_notification_worker.rb b/app/workers/event_notification_worker.rb index 282f2862eb..5491dea546 100644 --- a/app/workers/event_notification_worker.rb +++ b/app/workers/event_notification_worker.rb @@ -1,8 +1,7 @@ # frozen_string_literal: true class EventNotificationWorker < BaseWorker - sidekiq_options lock: :until_executed, - queue: :logs + sidekiq_options queue: :logs def perform( event, diff --git a/app/workers/license_expirations_worker.rb b/app/workers/license_expirations_worker.rb index f820fefa25..9fb1852404 100644 --- a/app/workers/license_expirations_worker.rb +++ b/app/workers/license_expirations_worker.rb @@ -2,7 +2,6 @@ class LicenseExpirationsWorker < BaseWorker sidekiq_options queue: :critical, - lock: :until_executed, lock_ttl: 30.minutes, on_conflict: :raise, cronitor_disabled: false def perform diff --git a/app/workers/license_overdue_check_ins_worker.rb b/app/workers/license_overdue_check_ins_worker.rb index e92a45087e..efce8fd488 100644 --- a/app/workers/license_overdue_check_ins_worker.rb +++ b/app/workers/license_overdue_check_ins_worker.rb @@ -2,7 +2,6 @@ class LicenseOverdueCheckInsWorker < BaseWorker sidekiq_options queue: :critical, - lock: :until_executed, lock_ttl: 30.minutes, on_conflict: :raise, cronitor_disabled: false def perform diff --git a/app/workers/machine_heartbeat_worker.rb b/app/workers/machine_heartbeat_worker.rb index b18ec80025..e55f79494d 100644 --- a/app/workers/machine_heartbeat_worker.rb +++ b/app/workers/machine_heartbeat_worker.rb @@ -2,12 +2,7 @@ class MachineHeartbeatWorker < BaseWorker sidekiq_options queue: :critical, - retry: 1_000_000, # retry forever - lock: :until_executing, - on_conflict: { - client: :replace, - server: :raise, - } + retry: 1_000_000 # retry forever sidekiq_retry_in { |count| if count in 0..60 diff --git a/app/workers/process_heartbeat_worker.rb b/app/workers/process_heartbeat_worker.rb index b5af406952..94c41754be 100644 --- a/app/workers/process_heartbeat_worker.rb +++ b/app/workers/process_heartbeat_worker.rb @@ -2,12 +2,7 @@ class ProcessHeartbeatWorker < BaseWorker sidekiq_options queue: :critical, - retry: 1_000_000, # retry forever - lock: :until_executing, - on_conflict: { - client: :replace, - server: :raise, - } + retry: 1_000_000 # retry forever sidekiq_retry_in { |count| if count in 0..60 diff --git a/app/workers/prune_event_logs_worker.rb b/app/workers/prune_event_logs_worker.rb index 930e68591c..da209484fc 100644 --- a/app/workers/prune_event_logs_worker.rb +++ b/app/workers/prune_event_logs_worker.rb @@ -31,7 +31,6 @@ class PruneEventLogsWorker < BaseWorker ].freeze sidekiq_options queue: :cron, - lock: :until_executed, cronitor_disabled: false def perform diff --git a/app/workers/prune_expired_tokens_worker.rb b/app/workers/prune_expired_tokens_worker.rb index 0bc5b88066..b60da9478c 100644 --- a/app/workers/prune_expired_tokens_worker.rb +++ b/app/workers/prune_expired_tokens_worker.rb @@ -3,7 +3,6 @@ class PruneExpiredTokensWorker < BaseWorker BATCH_WAIT = ENV.fetch('KEYGEN_PRUNE_BATCH_WAIT') { 1 }.to_f sidekiq_options queue: :cron, - lock: :until_executed, cronitor_disabled: false def perform diff --git a/app/workers/prune_metrics_worker.rb b/app/workers/prune_metrics_worker.rb index f8c17e0540..4cf5429b9f 100644 --- a/app/workers/prune_metrics_worker.rb +++ b/app/workers/prune_metrics_worker.rb @@ -5,7 +5,6 @@ class PruneMetricsWorker < BaseWorker BATCH_WAIT = ENV.fetch('KEYGEN_PRUNE_BATCH_WAIT') { 1 }.to_f sidekiq_options queue: :cron, - lock: :until_executed, cronitor_disabled: false def perform diff --git a/app/workers/prune_release_download_links_worker.rb b/app/workers/prune_release_download_links_worker.rb index 20f10c2605..b4edf04cbe 100644 --- a/app/workers/prune_release_download_links_worker.rb +++ b/app/workers/prune_release_download_links_worker.rb @@ -3,7 +3,6 @@ class PruneReleaseDownloadLinksWorker < BaseWorker BATCH_WAIT = ENV.fetch('KEYGEN_PRUNE_BATCH_WAIT') { 1 }.to_f sidekiq_options queue: :cron, - lock: :until_executed, cronitor_disabled: false def perform diff --git a/app/workers/prune_release_upgrade_links_worker.rb b/app/workers/prune_release_upgrade_links_worker.rb index 63257e3194..3a84ef7301 100644 --- a/app/workers/prune_release_upgrade_links_worker.rb +++ b/app/workers/prune_release_upgrade_links_worker.rb @@ -3,7 +3,6 @@ class PruneReleaseUpgradeLinksWorker < BaseWorker BATCH_WAIT = ENV.fetch('KEYGEN_PRUNE_BATCH_WAIT') { 1 }.to_f sidekiq_options queue: :cron, - lock: :until_executed, cronitor_disabled: false def perform diff --git a/app/workers/prune_request_logs_worker.rb b/app/workers/prune_request_logs_worker.rb index 1f977d2e91..8136172dc5 100644 --- a/app/workers/prune_request_logs_worker.rb +++ b/app/workers/prune_request_logs_worker.rb @@ -5,7 +5,6 @@ class PruneRequestLogsWorker < BaseWorker BATCH_WAIT = ENV.fetch('KEYGEN_PRUNE_BATCH_WAIT') { 1 }.to_f sidekiq_options queue: :cron, - lock: :until_executed, cronitor_disabled: false def perform diff --git a/app/workers/prune_webhook_events_worker.rb b/app/workers/prune_webhook_events_worker.rb index 45ce49f19e..468853ee37 100644 --- a/app/workers/prune_webhook_events_worker.rb +++ b/app/workers/prune_webhook_events_worker.rb @@ -5,7 +5,6 @@ class PruneWebhookEventsWorker < BaseWorker SLEEP_DURATION = ENV.fetch('PRUNE_SLEEP_DURATION') { 1 }.to_f sidekiq_options queue: :cron, - lock: :until_executed, cronitor_disabled: false def perform diff --git a/app/workers/request_limits_report_worker.rb b/app/workers/request_limits_report_worker.rb index b15008a962..82bf9fbe95 100644 --- a/app/workers/request_limits_report_worker.rb +++ b/app/workers/request_limits_report_worker.rb @@ -2,7 +2,6 @@ class RequestLimitsReportWorker < BaseWorker sidekiq_options queue: :cron, - lock: :until_executed, cronitor_disabled: false def perform diff --git a/app/workers/touch_license_worker.rb b/app/workers/touch_license_worker.rb index b68b587fbf..b29adf6b82 100644 --- a/app/workers/touch_license_worker.rb +++ b/app/workers/touch_license_worker.rb @@ -1,12 +1,7 @@ # frozen_string_literal: true class TouchLicenseWorker < BaseWorker - sidekiq_options retry: false, - lock: :until_executing, - on_conflict: { - client: :replace, - server: :raise, - } + sidekiq_options retry: false def perform(license_id, touches) license = License.find(license_id) diff --git a/app/workers/vacuum_analyze_event_logs_worker.rb b/app/workers/vacuum_analyze_event_logs_worker.rb index b755fdf947..0b77979df4 100644 --- a/app/workers/vacuum_analyze_event_logs_worker.rb +++ b/app/workers/vacuum_analyze_event_logs_worker.rb @@ -1,6 +1,5 @@ class VacuumAnalyzeEventLogsWorker < BaseWorker sidekiq_options queue: :cron, - lock: :until_executed, cronitor_disabled: false def perform diff --git a/app/workers/vacuum_analyze_metrics_worker.rb b/app/workers/vacuum_analyze_metrics_worker.rb index 69bea0bf50..8fde12dbd5 100644 --- a/app/workers/vacuum_analyze_metrics_worker.rb +++ b/app/workers/vacuum_analyze_metrics_worker.rb @@ -1,6 +1,5 @@ class VacuumAnalyzeMetricsWorker < BaseWorker sidekiq_options queue: :cron, - lock: :until_executed, cronitor_disabled: false def perform diff --git a/app/workers/vacuum_analyze_request_logs_worker.rb b/app/workers/vacuum_analyze_request_logs_worker.rb index e5bedd82a4..609c5bebf1 100644 --- a/app/workers/vacuum_analyze_request_logs_worker.rb +++ b/app/workers/vacuum_analyze_request_logs_worker.rb @@ -1,6 +1,5 @@ class VacuumAnalyzeRequestLogsWorker < BaseWorker sidekiq_options queue: :cron, - lock: :until_executed, cronitor_disabled: false def perform diff --git a/app/workers/vacuum_analyze_webhook_events_worker.rb b/app/workers/vacuum_analyze_webhook_events_worker.rb index cb1efbaacb..65e759c434 100644 --- a/app/workers/vacuum_analyze_webhook_events_worker.rb +++ b/app/workers/vacuum_analyze_webhook_events_worker.rb @@ -1,6 +1,5 @@ class VacuumAnalyzeWebhookEventsWorker < BaseWorker sidekiq_options queue: :cron, - lock: :until_executed, cronitor_disabled: false def perform diff --git a/app/workers/webhook_worker.rb b/app/workers/webhook_worker.rb index 293517e86d..766dc18bfc 100644 --- a/app/workers/webhook_worker.rb +++ b/app/workers/webhook_worker.rb @@ -10,7 +10,6 @@ class WebhookWorker < BaseWorker sidekiq_options queue: :webhooks, retry: 15, - lock: :until_executed, dead: false sidekiq_retry_in do |count| diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 4288450c9c..4f3c7118ad 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'sidekiq' -require 'sidekiq-unique-jobs' require 'sidekiq-cron' require 'sidekiq/web' @@ -37,10 +36,6 @@ write_timeout: ENV.fetch('REDIS_WRITE_TIMEOUT') { 5 }.to_i, read_timeout: ENV.fetch('REDIS_READ_TIMEOUT') { 5 }.to_i, } - - config.client_middleware do |chain| - chain.add SidekiqUniqueJobs::Middleware::Client - end end # Configure Sidekiq server @@ -53,23 +48,11 @@ network_timeout: 5, } - config.client_middleware do |chain| - chain.add SidekiqUniqueJobs::Middleware::Client - end - config.server_middleware do |chain| - chain.add SidekiqUniqueJobs::Middleware::Server unless ENV.key?('NO_CRONITOR') chain.add Sidekiq::Cronitor::ServerMiddleware end end - - SidekiqUniqueJobs::Server.configure(config) -end - -# Configure Sidekiq unique jobs -SidekiqUniqueJobs.configure do |config| - config.enabled = !Rails.env.test? end # Enable strict args for development/test diff --git a/config/routes.rb b/config/routes.rb index f581d509c0..cb30a6cc3e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'sidekiq/web' -require 'sidekiq_unique_jobs/web' Rails.application.routes.draw do domain_constraints = { diff --git a/spec/workers/cull_dead_machines_worker_spec.rb b/spec/workers/cull_dead_machines_worker_spec.rb index c079cd8a67..a00554f124 100644 --- a/spec/workers/cull_dead_machines_worker_spec.rb +++ b/spec/workers/cull_dead_machines_worker_spec.rb @@ -7,14 +7,8 @@ let(:worker) { CullDeadMachinesWorker } let(:account) { create(:account) } - # See: https://github.com/mhenrixon/sidekiq-unique-jobs#testing - before do - Sidekiq::Testing.inline! - end - - after do - Sidekiq::Worker.clear_all - end + before { Sidekiq::Testing.inline! } + after { Sidekiq::Testing.fake! } context 'without a monitor' do let(:heartbeat_jid) { nil } diff --git a/spec/workers/cull_dead_processes_worker_spec.rb b/spec/workers/cull_dead_processes_worker_spec.rb index 1582b778d3..42161e3c7d 100644 --- a/spec/workers/cull_dead_processes_worker_spec.rb +++ b/spec/workers/cull_dead_processes_worker_spec.rb @@ -7,14 +7,8 @@ let(:worker) { CullDeadProcessesWorker } let(:account) { create(:account) } - # See: https://github.com/mhenrixon/sidekiq-unique-jobs#testing - before do - Sidekiq::Testing.inline! - end - - after do - Sidekiq::Worker.clear_all - end + before { Sidekiq::Testing.inline! } + after { Sidekiq::Testing.fake! } context 'without a monitor' do let(:heartbeat_jid) { nil } diff --git a/spec/workers/license_expirations_worker_spec.rb b/spec/workers/license_expirations_worker_spec.rb index 6c8acc32e2..33739822f1 100644 --- a/spec/workers/license_expirations_worker_spec.rb +++ b/spec/workers/license_expirations_worker_spec.rb @@ -7,14 +7,6 @@ let(:worker) { LicenseExpirationsWorker } let(:account) { create(:account) } - it 'should enqueue and run the worker' do - worker.perform_async - expect(worker.jobs.size).to eq 1 - - worker.drain - expect(worker.jobs.size).to eq 0 - end - context 'when there is a license that has recently expired' do let(:event) { 'license.expired' } diff --git a/spec/workers/license_overdue_check_ins_worker_spec.rb b/spec/workers/license_overdue_check_ins_worker_spec.rb index b6c0d39c99..23b3a20744 100644 --- a/spec/workers/license_overdue_check_ins_worker_spec.rb +++ b/spec/workers/license_overdue_check_ins_worker_spec.rb @@ -7,14 +7,6 @@ let(:worker) { LicenseOverdueCheckInsWorker } let(:account) { create(:account) } - it 'should enqueue and run the worker' do - worker.perform_async - expect(worker.jobs.size).to eq 1 - - worker.drain - expect(worker.jobs.size).to eq 0 - end - context 'when there is a license that has recently become overdue' do let(:event) { 'license.check-in-overdue' } diff --git a/spec/workers/machine_heartbeat_worker_spec.rb b/spec/workers/machine_heartbeat_worker_spec.rb index 8161f50b7f..100fc05376 100644 --- a/spec/workers/machine_heartbeat_worker_spec.rb +++ b/spec/workers/machine_heartbeat_worker_spec.rb @@ -7,37 +7,6 @@ let(:worker) { MachineHeartbeatWorker } let(:account) { create(:account) } - # See: https://github.com/mhenrixon/sidekiq-unique-jobs#testing - before do - SidekiqUniqueJobs.configure { _1.enabled = true } - end - - after do - SidekiqUniqueJobs.configure { _1.enabled = false } - end - - it 'should enqueue and run the worker' do - machine = create :machine, last_heartbeat_at: nil, account: account - - worker.perform_async machine.id - expect(worker.jobs.size).to eq 1 - - worker.drain - expect(worker.jobs.size).to eq 0 - end - - it 'should replace the worker on conflict' do - machine = create :machine, last_heartbeat_at: nil, account: account - - worker.perform_async machine.id - worker.perform_async machine.id - worker.perform_async machine.id - expect(worker.jobs.size).to eq 1 - - worker.drain - expect(worker.jobs.size).to eq 0 - end - context 'when there is a machine that does not require heartbeats' do let(:machine) { create(:machine, last_heartbeat_at: heartbeat_at, account: account) } let(:event) { 'machine.heartbeat.pong' } diff --git a/spec/workers/process_heartbeat_worker_spec.rb b/spec/workers/process_heartbeat_worker_spec.rb index 3c53ae1269..920b883879 100644 --- a/spec/workers/process_heartbeat_worker_spec.rb +++ b/spec/workers/process_heartbeat_worker_spec.rb @@ -7,37 +7,6 @@ let(:worker) { ProcessHeartbeatWorker } let(:account) { create(:account) } - # See: https://github.com/mhenrixon/sidekiq-unique-jobs#testing - before do - SidekiqUniqueJobs.configure { _1.enabled = true } - end - - after do - SidekiqUniqueJobs.configure { _1.enabled = false } - end - - it 'should enqueue and run the worker' do - process = create(:machine_process, account:) - - worker.perform_async process.id - expect(worker.jobs.size).to eq 1 - - worker.drain - expect(worker.jobs.size).to eq 0 - end - - it 'should replace the worker on conflict' do - process = create(:machine_process, account:) - - worker.perform_async process.id - worker.perform_async process.id - worker.perform_async process.id - expect(worker.jobs.size).to eq 1 - - worker.drain - expect(worker.jobs.size).to eq 0 - end - context 'when heartbeat is alive' do let(:process) { create(:machine_process, last_heartbeat_at:, account:) } let(:event) { 'process.heartbeat.pong' } diff --git a/spec/workers/prune_event_logs_worker_spec.rb b/spec/workers/prune_event_logs_worker_spec.rb index 944f361dc0..b23374fc95 100644 --- a/spec/workers/prune_event_logs_worker_spec.rb +++ b/spec/workers/prune_event_logs_worker_spec.rb @@ -7,14 +7,8 @@ let(:worker) { PruneEventLogsWorker } let(:account) { create(:account) } - # See: https://github.com/mhenrixon/sidekiq-unique-jobs#testing - before do - Sidekiq::Testing.inline! - end - - after do - Sidekiq::Worker.clear_all - end + before { Sidekiq::Testing.inline! } + after { Sidekiq::Testing.fake! } it 'should prune backlog of high-volume event logs' do license = create(:license, account:) diff --git a/spec/workers/prune_request_logs_worker_spec.rb b/spec/workers/prune_request_logs_worker_spec.rb index d9a1caf68b..3a8622e220 100644 --- a/spec/workers/prune_request_logs_worker_spec.rb +++ b/spec/workers/prune_request_logs_worker_spec.rb @@ -7,14 +7,8 @@ let(:worker) { PruneRequestLogsWorker } let(:account) { create(:account) } - # See: https://github.com/mhenrixon/sidekiq-unique-jobs#testing - before do - Sidekiq::Testing.inline! - end - - after do - Sidekiq::Worker.clear_all - end + before { Sidekiq::Testing.inline! } + after { Sidekiq::Testing.fake! } it 'should prune backlog of request logs' do create_list(:request_log, 50, account:, created_at: (worker::BACKLOG_DAYS + 1).days.ago) diff --git a/spec/workers/prune_webhook_events_worker_spec.rb b/spec/workers/prune_webhook_events_worker_spec.rb index c3fa1aff47..4b7e2324d9 100644 --- a/spec/workers/prune_webhook_events_worker_spec.rb +++ b/spec/workers/prune_webhook_events_worker_spec.rb @@ -7,14 +7,8 @@ let(:worker) { PruneWebhookEventsWorker } let(:account) { create(:account) } - # See: https://github.com/mhenrixon/sidekiq-unique-jobs#testing - before do - Sidekiq::Testing.inline! - end - - after do - Sidekiq::Worker.clear_all - end + before { Sidekiq::Testing.inline! } + after { Sidekiq::Testing.fake! } it 'should prune backlog of webhook events' do create_list(:webhook_event, 50, account:, created_at: (worker::BACKLOG_DAYS + 1).days.ago)