diff --git a/Gemfile.lock b/Gemfile.lock index 04f10340b..497072e37 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -280,12 +280,11 @@ GEM rouge sprockets (>= 3) sprockets-rails - govuk_sidekiq (8.0.1) + govuk_sidekiq (9.0.0) gds-api-adapters (>= 19.1.0) govuk_app_config (>= 1.1) - redis (< 5) - redis-namespace (~> 1.6) - sidekiq (~> 6.5, >= 6.5.12) + redis-client (>= 0.22.2) + sidekiq (~> 7.0, < 8) govuk_test (4.1.0) brakeman (>= 5.0.2) capybara (>= 3.36) @@ -348,7 +347,7 @@ GEM method_source (1.0.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0820) + mime-types-data (3.2024.0903) mini_mime (1.1.5) mini_portile2 (2.8.7) minitest (5.25.1) @@ -674,9 +673,10 @@ GEM ffi (~> 1.0) rdoc (6.7.0) psych (>= 4.0.0) - redis (4.8.1) - redis-namespace (1.11.0) - redis (>= 4) + redis (5.3.0) + redis-client (>= 0.22.0) + redis-client (0.22.2) + connection_pool regexp_parser (2.9.2) reline (0.5.10) io-console (~> 0.5) @@ -780,10 +780,12 @@ GEM sidekiq (>= 3.0) shoulda-matchers (6.4.0) activesupport (>= 5.2.0) - sidekiq (6.5.12) - connection_pool (>= 2.2.5, < 3) - rack (~> 2.0) - redis (>= 4.5.0, < 5) + sidekiq (7.3.2) + concurrent-ruby (< 2) + connection_pool (>= 2.3.0) + logger + rack (>= 2.2.4) + redis-client (>= 0.22.2) signet (0.18.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) diff --git a/app/controllers/bulk_add_batches_controller.rb b/app/controllers/bulk_add_batches_controller.rb index 162b9c0ec..686dfbc0e 100644 --- a/app/controllers/bulk_add_batches_controller.rb +++ b/app/controllers/bulk_add_batches_controller.rb @@ -40,7 +40,7 @@ def import @batch.update!(batch_params.merge(state: "queued")) if @batch.entries_to_process.count > 20 - MappingsBatchWorker.perform_async(@batch.id) + MappingsBatchJob.perform_async(@batch.id) flash[:show_background_batch_progress_modal] = true else @batch.process diff --git a/app/controllers/import_batches_controller.rb b/app/controllers/import_batches_controller.rb index c75113a05..b4f0c36e4 100644 --- a/app/controllers/import_batches_controller.rb +++ b/app/controllers/import_batches_controller.rb @@ -31,7 +31,7 @@ def import @batch.update!(batch_params.merge(state: "queued")) if @batch.entries_to_process.count > 20 - MappingsBatchWorker.perform_async(@batch.id) + MappingsBatchJob.perform_async(@batch.id) flash[:show_background_batch_progress_modal] = true else @batch.process diff --git a/app/workers/mappings_batch_worker.rb b/app/sidekiq/mappings_batch_worker.rb similarity index 73% rename from app/workers/mappings_batch_worker.rb rename to app/sidekiq/mappings_batch_worker.rb index 624a63639..03ba7a106 100644 --- a/app/workers/mappings_batch_worker.rb +++ b/app/sidekiq/mappings_batch_worker.rb @@ -1,5 +1,5 @@ -class MappingsBatchWorker - include Sidekiq::Worker +class MappingsBatchJob + include Sidekiq::Job sidekiq_options retry: false def perform(mappings_batch_id) @@ -11,3 +11,5 @@ def perform(mappings_batch_id) end end end + +MappingsBatchWorker = MappingsBatchJob diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb deleted file mode 100644 index 98860c611..000000000 --- a/config/initializers/sidekiq.rb +++ /dev/null @@ -1,2 +0,0 @@ -# Use Sidekiq strict args to force Sidekiq 6 deprecations to error ahead of upgrade to Sidekiq 7 -Sidekiq.strict_args! diff --git a/spec/workers/mappings_batch_worker_spec.rb b/spec/sidekiq/mappings_batch_job_spec.rb similarity index 78% rename from spec/workers/mappings_batch_worker_spec.rb rename to spec/sidekiq/mappings_batch_job_spec.rb index 703715956..dcab8ef7d 100644 --- a/spec/workers/mappings_batch_worker_spec.rb +++ b/spec/sidekiq/mappings_batch_job_spec.rb @@ -1,12 +1,12 @@ require "spec_helper" -describe MappingsBatchWorker do +describe MappingsBatchJob do describe "perform" do describe "recording history", versioning: true do let(:user) { create(:user, name: "Bob") } let(:mappings_batch) { create(:bulk_add_batch, user:) } - before { MappingsBatchWorker.new.perform(mappings_batch.id) } + before { MappingsBatchJob.new.perform(mappings_batch.id) } subject { Mapping.first.versions.last } @@ -23,7 +23,7 @@ context "batch being deleted before processing" do it "should not raise an error" do - expect { MappingsBatchWorker.new.perform(1234) }.to_not raise_error + expect { MappingsBatchJob.new.perform(1234) }.to_not raise_error end end end diff --git a/spec/support/shared_examples/mappings_batch_controller.rb b/spec/support/shared_examples/mappings_batch_controller.rb index 4cd51fa64..16c66cf73 100644 --- a/spec/support/shared_examples/mappings_batch_controller.rb +++ b/spec/support/shared_examples/mappings_batch_controller.rb @@ -25,7 +25,7 @@ end it "queues a job" do - expect(MappingsBatchWorker.jobs.size).to eql(1) + expect(MappingsBatchJob.jobs.size).to eql(1) end it "updates the batch state" do @@ -41,7 +41,7 @@ end it "doesn't queue it (again)" do - expect(MappingsBatchWorker.jobs.size).to eql(0) + expect(MappingsBatchJob.jobs.size).to eql(0) end it "redirects to the site return URL" do diff --git a/spec/support/sidekiq.rb b/spec/support/sidekiq.rb index 7dff38eaa..903c80abd 100644 --- a/spec/support/sidekiq.rb +++ b/spec/support/sidekiq.rb @@ -5,6 +5,6 @@ RSpec.configure do |config| config.before(:each) do - Sidekiq::Worker.clear_all + Sidekiq::Job.clear_all end end