improve tests and fix

app/jobs/application_job.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
 
 class ApplicationJob < ActiveJob::Base
-  extend JobExtensions::RemoveDelayedJobs
 end

app/jobs/company/not_yet_taken_care_job.rb

@@ -4,7 +4,7 @@ class Company::NotYetTakenCareJob < ApplicationJob
 
   def perform
     retrieve_solicitations.each do |solicitation|
-      CompanyMailer.not_yet_taken_care(solicitation).deliver_later(queue: 'low_priority')
+      CompanyMailer.not_yet_taken_care(solicitation).deliver_later
     end
   end
 

app/services/antenne_coverage/deduplicated_job.rb

@@ -30,22 +30,12 @@ def update_antenne_coverage(antenne)
     end
 
     def delete_jobs_already_in_queue(antenne)
-      scheduled = if Rails.env == 'test'
-        Sidekiq::Job.jobs
-      else
-        Sidekiq::ScheduledSet.new
-      end
+      scheduled = Sidekiq::ScheduledSet.new
 
       scheduled.each do |job|
         return if job['queue'] != QUEUE_NAME
-        if Rails.env == 'test'
-          # Seule methode que j'ai trouvé pour vider Sidekiq::Job.jobs qui est accessible dans les tests,
-          # Sidekiq::ScheduledSet ne l'est pas
-          Sidekiq::Job.clear_all
-        else
-          if job['class'] == UpdateAntenneCoverageJob.to_s && job['args'].first == antenne.id
-            job.delete
-          end
+        if job['class'] == UpdateAntenneCoverageJob.to_s && job['args'].first == antenne.id
+          job.delete
         end
       end
     end

config/application.rb

@@ -35,7 +35,6 @@ class Application < Rails::Application
     config.action_mailer.default_url_options = { host: ENV['HOST_NAME'] }
 
     config.active_job.queue_adapter = :sidekiq
-    config.action_mailer.deliver_later_queue_name = 'default'
 
     config.middleware.insert_after ActionDispatch::RemoteIp, IpAnonymizer::MaskIp
     config.action_view.form_with_generates_remote_forms = true

config/cable.yml

@@ -4,7 +4,6 @@ development:
 
 test:
   adapter: test
-  url: redis://localhost:6379/1
 
 production:
   adapter: redis

spec/controllers/reminders/needs_controller_spec.rb

@@ -12,6 +12,7 @@
 
     it 'send email and set abandoned_email_sent' do
       assert_enqueued_with(job: ActionMailer::MailDeliveryJob)
+      expect(enqueued_jobs.count).to eq 1
       expect(need.reload.is_abandoned?).to be false
     end
   end
@@ -53,7 +54,7 @@
 
     it 'send email only for quo match and add a feedback' do
       assert_enqueued_with(job: ActionMailer::MailDeliveryJob)
-      assert_enqueued_with(job: ActionMailer::MailDeliveryJob)
+      expect(enqueued_jobs.count).to eq 1
       expect(Feedback.where(feedbackable_id: match1.need.id).count).to eq 1
     end
   end

spec/jobs/company/not_yet_taken_care_job_spec.rb

@@ -42,7 +42,10 @@
   describe 'perform_now' do
     before { described_class.perform_now }
 
-    it { assert_enqueued_with(job: ActionMailer::MailDeliveryJob) }
+    it do
+      assert_enqueued_with(job: ActionMailer::MailDeliveryJob)
+      expect(enqueued_jobs.count).to eq 1
+    end
   end
 
   describe 'enqueue a job' do

spec/jobs/company/send_intelligent_retention_emails_job_spec.rb

@@ -44,6 +44,7 @@
         expect(need_without_help.reload.retention_sent_at).to be_nil
         expect(need_all_wrong.reload.retention_sent_at).to be_nil
         assert_enqueued_with(job: ActionMailer::MailDeliveryJob)
+        expect(enqueued_jobs.count).to eq 2
       end
     end
   end

spec/jobs/company/solicitations_relaunch_job_spec.rb

@@ -11,7 +11,6 @@
     it 'send emails to solicitations not completed' do
       described_class.perform_now
       assert_enqueued_with(job: ActionMailer::MailDeliveryJob, args: ["CompanyMailer", "solicitation_relaunch_company", "deliver_now", { args: [solicitation] }])
-
     end
   end
 end

spec/jobs/send_status_notification_job_spec.rb

@@ -18,7 +18,7 @@
     end
 
     context "others status" do
-      # Les combinaisons de `should_notify_everyone` notifient tout le monde
+      # Les combinaisons de `should_notify_everyone` qui notifient tout le monde
       %w[taking_care done].each do |new_status|
         %w[quo not_for_me].each do |previous_status|
           it 'notifies everyone' do

spec/services/antenne_coverage/deduplicated_job_spec.rb

@@ -2,6 +2,8 @@
 
 require 'rails_helper'
 describe AntenneCoverage::DeduplicatedJob do
+  Sidekiq::Testing.disable!
+  before { Sidekiq::ScheduledSet.new.clear }
 
   describe '#call' do
     let(:institution) { create(:institution) }
@@ -10,17 +12,19 @@
     let!(:antenne) { create(:antenne, :local, institution: institution, communes: communes) }
 
     it do
-      expect(Sidekiq::Job.jobs.count).to eq 0
+      scheduled = Sidekiq::ScheduledSet.new
+
+      expect(scheduled.size).to eq 0
       antenne.update(communes: [])
-      expect(Sidekiq::Job.jobs.count).to eq 1
-      expect(Sidekiq::Job.jobs.last['args']).to eq [antenne.id]
-      first_job = Sidekiq::Job.jobs.first
+      expect(scheduled.size).to eq 1
+      expect(scheduled.first.args).to eq [antenne.id]
+      first_job = scheduled.first
 
       # Pas de nouveau job rajouté si on modifie la même antenne
       antenne.update(communes: [beaufay])
-      expect(Sidekiq::Job.jobs.count).to eq 1
-      expect(Sidekiq::Job.jobs.last['args']).to eq [antenne.id]
-      second_job = Sidekiq::Job.jobs.first
+      expect(scheduled.size).to eq 1
+      expect(scheduled.first.args).to eq [antenne.id]
+      second_job = scheduled.first
       expect(first_job['args']).to eq second_job['args']
       expect(first_job['class']).to eq second_job['class']
       expect(first_job['queue']).to eq second_job['queue']

spec/services/cancel_solicitation_with_email_spec.rb

@@ -16,6 +16,7 @@
         expect(solicitation.badges.first.title).to eq I18n.t(email_type, scope: 'solicitations.solicitation_actions.emails')
         expect(solicitation.status).to eq 'canceled'
         assert_enqueued_with(job: ActionMailer::MailDeliveryJob)
+        expect(enqueued_jobs.count).to eq 1
       end
     end
 

spec/services/match_mailer_service_spec.rb

@@ -2,13 +2,13 @@
 
 require 'rails_helper'
 describe MatchMailerService do
-  before do
-  ENV['APPLICATION_EMAIL'] = '[email protected]'
-  Sidekiq::ScheduledSet.new.clear
-end
-
   Sidekiq::Testing.disable!
 
+  before do
+    ENV['APPLICATION_EMAIL'] = '[email protected]'
+    Sidekiq::ScheduledSet.new.clear
+  end
+
   describe '#deduplicated_notify_status' do
     def notify_change(new_status)
       previous_status = a_match.status
@@ -44,7 +44,6 @@ def notify_change(new_status)
         expect(scheduled.size).to eq 0
         expect(a_match.status).to eq 'quo'
       end
-
     end
 
     context 'match taking_care and match not reachable' do

spec/services/needs_service_spec.rb

@@ -57,6 +57,7 @@
         expect(need5.reload.is_abandoned?).to be false
         expect(need6.reload.is_abandoned?).to be false
         assert_enqueued_with(job: ActionMailer::MailDeliveryJob)
+        expect(enqueued_jobs.count).to eq 1
       end
     end
 
@@ -86,6 +87,7 @@
         expect(need2.reload.is_abandoned?).to be true
         expect(need3.reload.is_abandoned?).to be false
         expect(need4.reload.is_abandoned?).to be false
+        assert_enqueued_with(job: ActionMailer::MailDeliveryJob)
         expect(enqueued_jobs.count).to eq 1
       end
     end

spec/services/quarterly_reports/notify_managers_spec.rb

@@ -14,6 +14,7 @@
       assert_enqueued_with(job: ActionMailer::MailDeliveryJob) do
         subject
       end
+      expect(enqueued_jobs.count).to eq 1
     end
   end
 end