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

Improve the names of some parameters in DossiersController

Browse source
This commit is contained in:
gregoirenovel 2017-11-30 17:29:26 +01:00
parent 684dafb6d4
commit dd47f96424
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/new_gestionnaire/dossiers_controller.rb
View file

@ -74,15 +74,15 @@ module NewGestionnaire
end end
case params[:process_action] case params[:process_action]
when "refuse" when "refuser"
next_step = "refuse" next_step = "refuse"
notice = "Dossier considéré comme refusé." notice = "Dossier considéré comme refusé."
template = procedure.refused_mail_template template = procedure.refused_mail_template
when "without_continuation" when "classer_sans_suite"
next_step = "without_continuation" next_step = "without_continuation"
notice = "Dossier considéré comme sans suite." notice = "Dossier considéré comme sans suite."
template = procedure.without_continuation_mail_template template = procedure.without_continuation_mail_template
when "close" when "accepter"
next_step = "close" next_step = "close"
notice = "Dossier traité avec succès." notice = "Dossier traité avec succès."
template = procedure.closed_mail_template template = procedure.closed_mail_template

6
app/views/new_gestionnaire/dossiers/_state_button.html.haml
View file

@ -43,9 +43,9 @@
.description .description
%h4 Refuser %h4 Refuser
L'usager sera notifié que son dossier a été refusé L'usager sera notifié que son dossier a été refusé
= render partial: 'new_gestionnaire/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Accepter le dossier', popup_class: 'accept', process_action: 'close', title: 'Accepter', confirm: 'Accepter ce dossier ?' } = render partial: 'new_gestionnaire/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Accepter le dossier', popup_class: 'accept', process_action: 'accepter', title: 'Accepter', confirm: 'Accepter ce dossier ?' }
= render partial: 'new_gestionnaire/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Classer le dossier sans suite', popup_class: 'without-continuation', process_action: 'without_continuation', title: 'Classer sans suite', confirm: 'Confirmer vous le classement sans suite de ce dossier ?' } = render partial: 'new_gestionnaire/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Classer le dossier sans suite', popup_class: 'without-continuation', process_action: 'classer_sans_suite', title: 'Classer sans suite', confirm: 'Confirmer vous le classement sans suite de ce dossier ?' }
= render partial: 'new_gestionnaire/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Refuser le dossier', popup_class: 'close', process_action: 'refuse', title: 'Refuser', confirm: 'Confirmer vous le refus de ce dossier ?' } = render partial: 'new_gestionnaire/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Refuser le dossier', popup_class: 'close', process_action: 'refuser', title: 'Refuser', confirm: 'Confirmer vous le refus de ce dossier ?' }
- else - else
- if dossier.motivation.present? || dossier.attestation.present? - if dossier.motivation.present? || dossier.attestation.present?

12
spec/controllers/new_gestionnaire/dossiers_controller_spec.rb
View file

@ -109,13 +109,13 @@ describe NewGestionnaire::DossiersController, type: :controller do
end end
describe '#terminer' do describe '#terminer' do
context "with refuse" do context "with refuser" do
before do before do
dossier.received! dossier.received!
sign_in gestionnaire sign_in gestionnaire
end end
subject { post :terminer, params: { process_action: "refuse", procedure_id: procedure.id, dossier_id: dossier.id} } subject { post :terminer, params: { process_action: "refuser", procedure_id: procedure.id, dossier_id: dossier.id} }
it 'change state to refused' do it 'change state to refused' do
subject subject
@ -135,13 +135,13 @@ describe NewGestionnaire::DossiersController, type: :controller do
it { is_expected.to redirect_to redirect_to dossier_path(procedure, dossier) } it { is_expected.to redirect_to redirect_to dossier_path(procedure, dossier) }
end end
context "with without_continuation" do context "with classer_sans_suite" do
before do before do
dossier.received! dossier.received!
sign_in gestionnaire sign_in gestionnaire
end end
subject { post :terminer, params: { process_action: "without_continuation", procedure_id: procedure.id, dossier_id: dossier.id} } subject { post :terminer, params: { process_action: "classer_sans_suite", procedure_id: procedure.id, dossier_id: dossier.id} }
it 'change state to without_continuation' do it 'change state to without_continuation' do
subject subject
@ -161,7 +161,7 @@ describe NewGestionnaire::DossiersController, type: :controller do
it { is_expected.to redirect_to redirect_to dossier_path(procedure, dossier) } it { is_expected.to redirect_to redirect_to dossier_path(procedure, dossier) }
end end
context "with close" do context "with accepter" do
let(:expected_attestation) { nil } let(:expected_attestation) { nil }
before do before do
@ -175,7 +175,7 @@ describe NewGestionnaire::DossiersController, type: :controller do
expect(NotificationMailer).to receive(:deliver_now!) expect(NotificationMailer).to receive(:deliver_now!)
end end
subject { post :terminer, params: { process_action: "close", procedure_id: procedure.id, dossier_id: dossier.id} } subject { post :terminer, params: { process_action: "accepter", procedure_id: procedure.id, dossier_id: dossier.id} }
it 'change state to closed' do it 'change state to closed' do
subject subject