add changes to make testing easier

DFE-Digital · Aug 22, 2023 · e3e8f06 · e3e8f06
1 parent 66c38a1
commit e3e8f06
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -87,7 +87,9 @@ def self.dashboard_headers
   scope :with_passing_assessments, -> { with_assessments.merge(UserAssessment.passes) }
 
   scope :start_training_recipients, -> { training_email_recipients.month_old_confirmation.registration_complete.not_started_training }
-  scope :complete_registration_recipients, -> { training_email_recipients.month_old_confirmation.registration_incomplete }
+  # scope :complete_registration_recipients, -> { training_email_recipients.month_old_confirmation.registration_incomplete }
+  #TODO: change back to the above scope before merging
+  scope :complete_registration_recipients, -> { training_email_recipients.registration_incomplete }
   scope :continue_training_recipients, -> { training_email_recipients.select(&:continue_training_recipient?) }
   scope :completed_available_modules, -> { training_email_recipients.select(&:completed_available_modules?) }
 

diff --git a/config/initializers/que.rb b/config/initializers/que.rb
@@ -1,7 +1,8 @@
 Que::Scheduler.configure do |config|
   config.schedule = {
     DashboardJob: { cron: Rails.application.config.dashboard_update_interval },
-    CompleteRegistrationMailJob: { cron: Rails.application.config.mail_job_interval },
+    # TODO: change this interval before merging
+    CompleteRegistrationMailJob: { cron: '*/5 * * * *' },
     StartTrainingMailJob: { cron: Rails.application.config.mail_job_interval },
     ContinueTrainingMailJob: { cron: Rails.application.config.mail_job_interval },
   }

diff --git a/spec/jobs/complete_registration_mail_job_spec.rb b/spec/jobs/complete_registration_mail_job_spec.rb
@@ -6,15 +6,17 @@
     let!(:user_2) { create(:user, confirmed_at: 4.weeks.ago) }
     let!(:user_3) { create(:user, confirmed_at: 4.weeks.ago) }
     let!(:user_4) { create(:user, :registered, confirmed_at: 1.month.ago) }
-    let!(:user_5) { create(:user, confirmed_at: 2.months.ago) }
+    #TODO: uncomment this before merging
+    # let!(:user_5) { create(:user, confirmed_at: 2.months.ago) }
 
     before do
       allow(NotifyMailer).to receive(:complete_registration)
     end
 
     it 'emails the correct users' do
       expected = [user_1, user_2, user_3]
-      excluded = [user_4, user_5]
+      # excluded = [user_4, user_5]
+      excluded = [user_4]
       expect(described_class.run).to send_expected_emails(
         mailer_method: :complete_registration,
         expected_users: expected,