DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

#4807 better method/variable naming

Browse source
This commit is contained in:
maatinito 2020-03-18 16:46:12 -10:00
parent e61c53f267
commit f5c2dc03c5
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/mailers/dossier_mailer.rb
View file

@ -105,7 +105,7 @@ class DossierMailer < ApplicationMailer
mail(from: NO_REPLY_EMAIL, to: instructeur.email, subject: @subject)
end
def notify_dossier_not_submitted(dossier)
def notify_brouillon_not_submitted(dossier)
@subject = "Attention : votre dossier n'est pas déposé."
@dossier = dossier

2
app/models/dossier.rb
View file

@ -710,7 +710,7 @@ class Dossier < ApplicationRecord
brouillon_close_to_procedure_closing_date
.includes(:procedure, :user)
.find_each do |dossier|
DossierMailer.notify_dossier_not_submitted(dossier).deliver_later
DossierMailer.notify_brouillon_not_submitted(dossier).deliver_later
end
end
end

0
app/views/dossier_mailer/notify_dossier_not_submitted.html.haml → app/views/dossier_mailer/notify_brouillon_not_submitted.html.haml
View file

4
spec/mailers/previews/dossier_mailer_preview.rb
View file

@ -53,8 +53,8 @@ class DossierMailerPreview < ActionMailer::Preview
DossierMailer.notify_automatic_deletion_to_administration([deleted_dossier, deleted_dossier], administration_email)
end
def notify_dossier_not_submitted
DossierMailer.notify_dossier_not_submitted(draft)
def notify_brouillon_not_submitted
DossierMailer.notify_brouillon_not_submitted(draft)
end
private

12
spec/models/dossier_spec.rb
View file

@ -1160,22 +1160,22 @@ describe Dossier do
let!(:procedure_closed_before) { create(:procedure, auto_archive_on: Time.zone.today + Dossier::REMAINING_TIME_BEFORE_CLOSING - 1.day) }
# user 1 has three draft dossiers where one is for procedure that closes in two days ==> should trigger one mail
let!(:draft_in_time) { create(:dossier, user: user1, procedure: procedure_closed_in_time) }
let!(:draft_near_closing) { create(:dossier, user: user1, procedure: procedure_closed_in_time) }
let!(:draft_before) { create(:dossier, user: user1, procedure: procedure_closed_before) }
let!(:draft_later) { create(:dossier, user: user1, procedure: procedure_closed_later) }
# user 2 submitted a draft and en_construction dossier for the same procedure ==> should not trigger the mail
let!(:draft_in_time2) { create(:dossier, :en_construction, user: user2, procedure: procedure_closed_in_time) }
let!(:submitted_in_time2) { create(:dossier, user: user2, procedure: procedure_closed_in_time) }
let!(:draft_near_closing_2) { create(:dossier, :en_construction, user: user2, procedure: procedure_closed_in_time) }
let!(:submitted_in_time_2) { create(:dossier, user: user2, procedure: procedure_closed_in_time) }
before do
allow(DossierMailer).to receive(:notify_dossier_not_submitted).and_return(double(deliver_later: nil))
allow(DossierMailer).to receive(:notify_brouillon_not_submitted).and_return(double(deliver_later: nil))
Dossier.notify_draft_not_submitted
end
it 'notifies draft is not submitted' do
expect(DossierMailer).to have_received(:notify_dossier_not_submitted).once
expect(DossierMailer).to have_received(:notify_dossier_not_submitted).with(draft_in_time)
expect(DossierMailer).to have_received(:notify_brouillon_not_submitted).once
expect(DossierMailer).to have_received(:notify_brouillon_not_submitted).with(draft_near_closing)
end
end