diff --git a/config/initializers/que.rb b/config/initializers/que.rb index 4f5704a77..0dd849f91 100644 --- a/config/initializers/que.rb +++ b/config/initializers/que.rb @@ -1,8 +1,7 @@ Que::Scheduler.configure do |config| config.schedule = { DashboardJob: { cron: Rails.application.config.dashboard_update_interval }, - # TODO: change this interval before merging - CompleteRegistrationMailJob: { cron: '*/5 * * * *' }, + CompleteRegistrationMailJob: { cron: Rails.application.config.mail_job_interval }, 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 index 49ad5fd32..d1da0586d 100644 --- a/spec/jobs/complete_registration_mail_job_spec.rb +++ b/spec/jobs/complete_registration_mail_job_spec.rb @@ -14,6 +14,5 @@ ] end - # 1 user receives the :complete_registration email template it_behaves_like 'an email prompt' end diff --git a/spec/jobs/continue_training_mail_job_spec.rb b/spec/jobs/continue_training_mail_job_spec.rb index a90ff26e7..eefdab6a0 100644 --- a/spec/jobs/continue_training_mail_job_spec.rb +++ b/spec/jobs/continue_training_mail_job_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' RSpec.describe ContinueTrainingMailJob do - include_context 'with progress' # why if this is event powered + include_context 'with progress' let(:template) { :continue_training } @@ -40,6 +40,5 @@ travel_back end - # 1 user receives the :continue_training email template it_behaves_like 'an email prompt', nil, Training::Module.by_name(:alpha) end diff --git a/spec/jobs/new_module_mail_job_spec.rb b/spec/jobs/new_module_mail_job_spec.rb index ebf10b86d..3ace4d9d4 100644 --- a/spec/jobs/new_module_mail_job_spec.rb +++ b/spec/jobs/new_module_mail_job_spec.rb @@ -11,8 +11,6 @@ create_list :user, 2, :registered, confirmed_at: 4.weeks.ago end - # module_release == a publication - before do create(:release, id: 1) create(:module_release, release_id: 1, module_position: 1, name: 'alpha') @@ -24,6 +22,5 @@ complete_module(bravo, 1.minute) end - # 1 user receives the :new_module email template informing them of the new module: charlie it_behaves_like 'an email prompt', 2, Training::Module.by_name(:charlie) end diff --git a/spec/jobs/start_training_mail_job_spec.rb b/spec/jobs/start_training_mail_job_spec.rb index 8f7bbefd0..197f8c55c 100644 --- a/spec/jobs/start_training_mail_job_spec.rb +++ b/spec/jobs/start_training_mail_job_spec.rb @@ -14,6 +14,5 @@ ] end - # 1 user receives the :start_training email template it_behaves_like 'an email prompt' end