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

feat(instructeur): nest all instruction routes under statut params for back purpose

Browse source
This commit is contained in:
mfo 2024-11-20 11:34:40 +01:00
parent b426e51d87
commit c260c43dac
No known key found for this signature in database
GPG key ID: 7CE3E1F5B794A8EC
30 changed files with 195 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

29
spec/components/dossiers/batch_alert_component_spec.rb
View file

@ -5,6 +5,15 @@ RSpec.describe Dossiers::BatchAlertComponent, type: :component do
let(:procedure) { create(:procedure) }
subject { render_inline(component).to_html }
let(:component) do
described_class.new(
batch: batch_operation,
procedure:
)
end
before do
allow(component).to receive(:procedure_path).and_return(Rails.application.routes.url_helpers.instructeur_procedure_path(procedure, statut: 'a-suivre'))
end
describe 'archiver' do
let(:component) do
@ -54,7 +63,7 @@ RSpec.describe Dossiers::BatchAlertComponent, type: :component do
it { expect(batch_operation.seen_at).to eq(nil) }
it 'on next render "seen_at" is set to avoid rendering alert' do
render_inline(component).to_html
render_inline(described_class.new(batch: batch_operation, procedure:)).to_html
expect(batch_operation.seen_at).not_to eq(nil)
end
end
@ -108,7 +117,7 @@ RSpec.describe Dossiers::BatchAlertComponent, type: :component do
it { expect(batch_operation.seen_at).to eq(nil) }
it 'on next render "seen_at" is set to avoid rendering alert' do
render_inline(component).to_html
render_inline(described_class.new(batch: batch_operation, procedure:)).to_html
expect(batch_operation.seen_at).not_to eq(nil)
end
end
@ -162,7 +171,7 @@ RSpec.describe Dossiers::BatchAlertComponent, type: :component do
it { expect(batch_operation.seen_at).to eq(nil) }
it 'on next render "seen_at" is set to avoid rendering alert' do
render_inline(component).to_html
render_inline(described_class.new(batch: batch_operation, procedure:)).to_html
expect(batch_operation.seen_at).not_to eq(nil)
end
end
@ -216,7 +225,7 @@ RSpec.describe Dossiers::BatchAlertComponent, type: :component do
it { expect(batch_operation.seen_at).to eq(nil) }
it 'on next render "seen_at" is set to avoid rendering alert' do
render_inline(component).to_html
render_inline(described_class.new(batch: batch_operation, procedure:)).to_html
expect(batch_operation.seen_at).not_to eq(nil)
end
end
@ -270,7 +279,7 @@ RSpec.describe Dossiers::BatchAlertComponent, type: :component do
it { expect(batch_operation.seen_at).to eq(nil) }
it 'on next render "seen_at" is set to avoid rendering alert' do
render_inline(component).to_html
render_inline(described_class.new(batch: batch_operation, procedure:)).to_html
expect(batch_operation.seen_at).not_to eq(nil)
end
end
@ -396,7 +405,7 @@ RSpec.describe Dossiers::BatchAlertComponent, type: :component do
it { expect(batch_operation.seen_at).to eq(nil) }
it 'on next render "seen_at" is set to avoid rendering alert' do
render_inline(component).to_html
render_inline(described_class.new(batch: batch_operation, procedure:)).to_html
expect(batch_operation.seen_at).not_to eq(nil)
end
end
@ -450,7 +459,7 @@ RSpec.describe Dossiers::BatchAlertComponent, type: :component do
it { expect(batch_operation.seen_at).to eq(nil) }
it 'on next render "seen_at" is set to avoid rendering alert' do
render_inline(component).to_html
render_inline(described_class.new(batch: batch_operation, procedure:)).to_html
expect(batch_operation.seen_at).not_to eq(nil)
end
end
@ -504,7 +513,7 @@ RSpec.describe Dossiers::BatchAlertComponent, type: :component do
it { expect(batch_operation.seen_at).to eq(nil) }
it 'on next render "seen_at" is set to avoid rendering alert' do
render_inline(component).to_html
render_inline(described_class.new(batch: batch_operation, procedure:)).to_html
expect(batch_operation.seen_at).not_to eq(nil)
end
end
@ -558,7 +567,7 @@ RSpec.describe Dossiers::BatchAlertComponent, type: :component do
it { expect(batch_operation.seen_at).to eq(nil) }
it 'on next render "seen_at" is set to avoid rendering alert' do
render_inline(component).to_html
render_inline(described_class.new(batch: batch_operation, procedure:)).to_html
expect(batch_operation.seen_at).not_to eq(nil)
end
end
@ -612,7 +621,7 @@ RSpec.describe Dossiers::BatchAlertComponent, type: :component do
it { expect(batch_operation.seen_at).to eq(nil) }
it 'on next render "seen_at" is set to avoid rendering alert' do
render_inline(component).to_html
render_inline(described_class.new(batch: batch_operation, procedure:)).to_html
expect(batch_operation.seen_at).not_to eq(nil)
end
end

6
spec/components/dossiers/message_component_spec.rb
View file

@ -10,6 +10,10 @@ RSpec.describe Dossiers::MessageComponent, type: :component do
groupe_gestionnaire: groupe_gestionnaire
)
end
before do
allow(component).to receive(:params).and_return({ statut: 'a-suivre' })
end
let(:seen_at) { commentaire.created_at + 1.hour }
describe 'for dossier' do
@ -230,7 +234,7 @@ RSpec.describe Dossiers::MessageComponent, type: :component do
describe 'delete message button for gestionnaire' do
let(:connected_user) { gestionnaire }
let(:form_url) { component.helpers.gestionnaire_groupe_gestionnaire_commentaire_path(groupe_gestionnaire, commentaire) }
let(:form_url) { component.helpers.gestionnaire_groupe_gestionnaire_commentaire_path(groupe_gestionnaire, commentaire, statut: 'a-suivre') }
context 'when commentaire had been written by connected gestionnaire' do
it { is_expected.to have_selector("form[action=\"#{form_url}\"]") }

4
spec/components/instructeurs/en_contruction_menu_component_spec.rb
View file

@ -4,7 +4,9 @@ RSpec.describe Instructeurs::EnConstructionMenuComponent, type: :component do
include DossierHelper
subject do
render_inline(described_class.new(dossier:))
component = described_class.new(dossier:)
allow(component).to receive(:statut).and_return('a-suivre')
render_inline(component)
end
matcher :have_dropdown_title do |expected_title|

6
spec/controllers/instructeurs/avis_controller_spec.rb
View file

@ -19,7 +19,7 @@ describe Instructeurs::AvisController, type: :controller do
let!(:avis) { create(:avis, dossier: dossier, claimant: instructeur, experts_procedure: experts_procedure) }
before do
patch :revoquer, params: { procedure_id: procedure.id, id: avis.id }
patch :revoquer, params: { procedure_id: procedure.id, id: avis.id, statut: 'a-suivre' }
end
it "revoke the dossier" do
@ -35,7 +35,7 @@ describe Instructeurs::AvisController, type: :controller do
let!(:avis) { create(:avis, dossier: dossier, claimant: instructeur, experts_procedure: experts_procedure) }
it 'sends a reminder to the expert' do
get :remind, params: { procedure_id: procedure.id, id: avis.id }
get :remind, params: { procedure_id: procedure.id, id: avis.id, statut: 'a-suivre' }
expect(AvisMailer).to have_received(:avis_invitation_and_confirm_email)
expect(flash.notice).to eq("Un mail de relance a été envoyé à #{avis.expert.email}")
expect(avis.reload.reminded_at).to be_present
@ -46,7 +46,7 @@ describe Instructeurs::AvisController, type: :controller do
let!(:avis) { create(:avis, dossier: dossier, claimant: instructeur, experts_procedure: experts_procedure, question_label: '123') }
it 'sends a reminder to the expert' do
get :remind, params: { procedure_id: procedure.id, id: avis.id }
get :remind, params: { procedure_id: procedure.id, id: avis.id, statut: 'a-suivre' }
expect(AvisMailer).to have_received(:avis_invitation_and_confirm_email)
expect(flash.notice).to eq("Un mail de relance a été envoyé à #{avis.expert.email}")
expect(avis.reload.reminded_at).to be_present

8
spec/controllers/instructeurs/batch_operations_controller_spec.rb
View file

@ -10,7 +10,8 @@ describe Instructeurs::BatchOperationsController, type: :controller do
batch_operation: {
operation: BatchOperation.operations.fetch(:archiver),
dossier_ids: [dossier.id]
}
},
statut: 'a-suivre'
}
end
@ -20,7 +21,10 @@ describe Instructeurs::BatchOperationsController, type: :controller do
context 'ACL' do
let(:params) do
{ procedure_id: create(:procedure).id }
{
procedure_id: create(:procedure).id,
statut: 'a-suivre'
}
end
it 'fails when procedure does not belongs to instructeur' do

6
spec/controllers/instructeurs/commentaires_controller_spec.rb
View file

@ -13,7 +13,7 @@ describe Instructeurs::CommentairesController, type: :controller do
describe 'destroy' do
context 'when it works' do
let(:commentaire) { create(:commentaire, instructeur: instructeur, dossier: dossier) }
subject { delete :destroy, params: { dossier_id: dossier.id, procedure_id: procedure.id, id: commentaire.id }, format: :turbo_stream }
subject { delete :destroy, params: { dossier_id: dossier.id, procedure_id: procedure.id, id: commentaire.id, statut: 'a-suivre' }, format: :turbo_stream }
it 'respond with OK and flash' do
expect(subject).to have_http_status(:ok)
@ -48,7 +48,7 @@ describe Instructeurs::CommentairesController, type: :controller do
context 'when dossier had been discarded' do
let(:commentaire) { create(:commentaire, instructeur: instructeur, dossier: dossier, discarded_at: 2.hours.ago) }
subject { delete :destroy, params: { dossier_id: dossier.id, procedure_id: procedure.id, id: commentaire.id }, format: :turbo_stream }
subject { delete :destroy, params: { dossier_id: dossier.id, procedure_id: procedure.id, id: commentaire.id, statut: 'a-suivre' }, format: :turbo_stream }
it 'respond with OK and flash' do
expect(subject).to have_http_status(:ok)
@ -65,7 +65,7 @@ describe Instructeurs::CommentairesController, type: :controller do
describe 'destroy' do
context 'when it works' do
let(:commentaire) { create(:commentaire, expert: expert, dossier: dossier) }
subject { delete :destroy, params: { dossier_id: dossier.id, procedure_id: procedure.id, id: commentaire.id }, format: :turbo_stream }
subject { delete :destroy, params: { dossier_id: dossier.id, procedure_id: procedure.id, id: commentaire.id, statut: 'a-suivre' }, format: :turbo_stream }
it 'respond with OK and flash' do
expect(subject).to have_http_status(:ok)

83
spec/controllers/instructeurs/dossiers_controller_spec.rb
View file

@ -33,7 +33,8 @@ describe Instructeurs::DossiersController, type: :controller do
params: {
recipients: [recipient.id],
procedure_id: procedure.id,
dossier_id: dossier.id
dossier_id: dossier.id,
statut: 'a-suivre'
}
)
end
@ -64,7 +65,7 @@ describe Instructeurs::DossiersController, type: :controller do
subject do
batch_operation
patch :follow, params: { procedure_id: procedure.id, dossier_id: dossier.id }
patch :follow, params: { procedure_id: procedure.id, dossier_id: dossier.id, statut: 'a-suivre' }
end
it do
@ -93,7 +94,7 @@ describe Instructeurs::DossiersController, type: :controller do
subject do
batch_operation
patch :unfollow, params: { procedure_id: procedure.id, dossier_id: dossier.id }
patch :unfollow, params: { procedure_id: procedure.id, dossier_id: dossier.id, statut: 'a-suivre' }
end
it do
@ -121,7 +122,7 @@ describe Instructeurs::DossiersController, type: :controller do
let(:batch_operation) {}
before do
batch_operation
patch :archive, params: { procedure_id: procedure.id, dossier_id: dossier.id }
patch :archive, params: { procedure_id: procedure.id, dossier_id: dossier.id, statut: 'a-suivre' }
dossier.reload
instructeur.follow(dossier)
end
@ -142,7 +143,7 @@ describe Instructeurs::DossiersController, type: :controller do
before do
batch_operation
dossier.update(archived: true)
patch :unarchive, params: { procedure_id: procedure.id, dossier_id: dossier.id }
patch :unarchive, params: { procedure_id: procedure.id, dossier_id: dossier.id, statut: 'a-suivre' }
end
it { expect(dossier.reload.archived).to eq(false) }
@ -162,7 +163,7 @@ describe Instructeurs::DossiersController, type: :controller do
before do
batch_operation
sign_in(instructeur.user)
post :passer_en_instruction, params: { procedure_id: procedure.id, dossier_id: dossier.id }, format: :turbo_stream
post :passer_en_instruction, params: { procedure_id: procedure.id, dossier_id: dossier.id, statut: 'a-suivre' }, format: :turbo_stream
end
it { expect(dossier.reload.state).to eq(Dossier.states.fetch(:en_instruction)) }
@ -208,7 +209,7 @@ describe Instructeurs::DossiersController, type: :controller do
batch_operation
sign_in(instructeur.user)
post :repasser_en_construction,
params: { procedure_id: procedure.id, dossier_id: dossier.id },
params: { procedure_id: procedure.id, dossier_id: dossier.id, statut: 'a-suivre' },
format: :turbo_stream
end
@ -243,7 +244,7 @@ describe Instructeurs::DossiersController, type: :controller do
sign_in current_user
batch_operation
post :repasser_en_instruction,
params: { procedure_id: procedure.id, dossier_id: dossier.id },
params: { procedure_id: procedure.id, dossier_id: dossier.id, statut: 'a-suivre' },
format: :turbo_stream
end
@ -297,7 +298,7 @@ describe Instructeurs::DossiersController, type: :controller do
end
context 'simple refusal' do
subject { post :terminer, params: { process_action: "refuser", procedure_id: procedure.id, dossier_id: dossier.id }, format: :turbo_stream }
subject { post :terminer, params: { process_action: "refuser", procedure_id: procedure.id, dossier_id: dossier.id, statut: 'a-suivre' }, format: :turbo_stream }
it 'change state to refuse' do
subject
@ -321,7 +322,7 @@ describe Instructeurs::DossiersController, type: :controller do
end
context 'refusal with a justificatif' do
subject { post :terminer, params: { process_action: "refuser", procedure_id: procedure.id, dossier_id: dossier.id, dossier: { justificatif_motivation: fake_justificatif } }, format: :turbo_stream }
subject { post :terminer, params: { process_action: "refuser", procedure_id: procedure.id, dossier_id: dossier.id, dossier: { justificatif_motivation: fake_justificatif }, statut: 'a-suivre' }, format: :turbo_stream }
it 'attachs a justificatif' do
subject
@ -336,7 +337,7 @@ describe Instructeurs::DossiersController, type: :controller do
context 'with dossier in batch_operation' do
let!(:batch_operation) { create(:batch_operation, operation: :archiver, dossiers: [dossier], instructeur: instructeur) }
subject { post :terminer, params: { process_action: "refuser", procedure_id: procedure.id, dossier_id: dossier.id }, format: :turbo_stream }
subject { post :terminer, params: { process_action: "refuser", procedure_id: procedure.id, dossier_id: dossier.id, statut: 'a-suivre' }, format: :turbo_stream }
it { expect { subject }.not_to change { dossier.reload.state } }
it { is_expected.to redirect_to(instructeur_dossier_path(dossier.procedure, dossier)) }
@ -353,7 +354,7 @@ describe Instructeurs::DossiersController, type: :controller do
sign_in(instructeur.user)
end
context 'without continuation' do
subject { post :terminer, params: { process_action: "classer_sans_suite", procedure_id: procedure.id, dossier_id: dossier_for_tiers.id }, format: :turbo_stream }
subject { post :terminer, params: { process_action: "classer_sans_suite", procedure_id: procedure.id, dossier_id: dossier_for_tiers.id, statut: 'a-suivre' }, format: :turbo_stream }
it 'Notification email is sent' do
expect(NotificationMailer).to receive(:send_sans_suite_notification)
@ -379,7 +380,7 @@ describe Instructeurs::DossiersController, type: :controller do
sign_in(instructeur.user)
end
context 'without continuation' do
subject { post :terminer, params: { process_action: "classer_sans_suite", procedure_id: procedure.id, dossier_id: dossier_for_tiers_without_notif.id }, format: :turbo_stream }
subject { post :terminer, params: { process_action: "classer_sans_suite", procedure_id: procedure.id, dossier_id: dossier_for_tiers_without_notif.id, statut: 'a-suivre' }, format: :turbo_stream }
it 'Notification email is sent' do
expect(NotificationMailer).to receive(:send_sans_suite_notification)
@ -405,7 +406,7 @@ describe Instructeurs::DossiersController, type: :controller do
sign_in(instructeur.user)
end
context 'with classer_sans_suite' do
subject { post :terminer, params: { process_action: "classer_sans_suite", procedure_id: procedure_accuse_lecture.id, dossier_id: dossier_accuse_lecture.id }, format: :turbo_stream }
subject { post :terminer, params: { process_action: "classer_sans_suite", procedure_id: procedure_accuse_lecture.id, dossier_id: dossier_accuse_lecture.id, statut: 'a-suivre' }, format: :turbo_stream }
it 'Notification accuse de lecture email is sent and not the others' do
expect(NotificationMailer).to receive(:send_accuse_lecture_notification)
@ -433,7 +434,7 @@ describe Instructeurs::DossiersController, type: :controller do
sign_in(instructeur.user)
end
context 'without attachment' do
subject { post :terminer, params: { process_action: "classer_sans_suite", procedure_id: procedure.id, dossier_id: dossier.id }, format: :turbo_stream }
subject { post :terminer, params: { process_action: "classer_sans_suite", procedure_id: procedure.id, dossier_id: dossier.id, statut: 'a-suivre' }, format: :turbo_stream }
it 'change state to sans_suite' do
subject
@ -458,7 +459,7 @@ describe Instructeurs::DossiersController, type: :controller do
end
context 'with attachment' do
subject { post :terminer, params: { process_action: "classer_sans_suite", procedure_id: procedure.id, dossier_id: dossier.id, dossier: { justificatif_motivation: fake_justificatif } }, format: :turbo_stream }
subject { post :terminer, params: { process_action: "classer_sans_suite", procedure_id: procedure.id, dossier_id: dossier.id, statut: 'a-suivre', dossier: { justificatif_motivation: fake_justificatif } }, format: :turbo_stream }
it 'change state to sans_suite' do
subject
@ -484,7 +485,7 @@ describe Instructeurs::DossiersController, type: :controller do
expect(NotificationMailer).to receive(:deliver_later)
end
subject { post :terminer, params: { process_action: "accepter", procedure_id: procedure.id, dossier_id: dossier.id }, format: :turbo_stream }
subject { post :terminer, params: { process_action: "accepter", procedure_id: procedure.id, dossier_id: dossier.id, statut: 'a-suivre' }, format: :turbo_stream }
it 'change state to accepte' do
subject
@ -532,7 +533,8 @@ describe Instructeurs::DossiersController, type: :controller do
process_action: "accepter",
procedure_id: procedure.id,
dossier_id: dossier.id,
dossier: { motivation: "Yallah" }
dossier: { motivation: "Yallah" },
statut: 'a-suivre'
}, format: :turbo_stream
end
@ -546,7 +548,7 @@ describe Instructeurs::DossiersController, type: :controller do
end
context 'with an attachment' do
subject { post :terminer, params: { process_action: "accepter", procedure_id: procedure.id, dossier_id: dossier.id, dossier: { justificatif_motivation: fake_justificatif } }, format: :turbo_stream }
subject { post :terminer, params: { process_action: "accepter", procedure_id: procedure.id, dossier_id: dossier.id, dossier: { justificatif_motivation: fake_justificatif }, statut: 'a-suivre' }, format: :turbo_stream }
it 'change state to accepte' do
subject
@ -564,7 +566,7 @@ describe Instructeurs::DossiersController, type: :controller do
let(:procedure) { create(:procedure, :published, for_individual: false, instructeurs: instructeurs) }
let(:dossier) { create(:dossier, :en_instruction, :with_entreprise, procedure: procedure, as_degraded_mode: true) }
subject { post :terminer, params: { process_action: "accepter", procedure_id: procedure.id, dossier_id: dossier.id }, format: :turbo_stream }
subject { post :terminer, params: { process_action: "accepter", procedure_id: procedure.id, dossier_id: dossier.id, statut: 'a-suivre' }, format: :turbo_stream }
context "with accepter" do
it 'warns about the error' do
@ -583,7 +585,7 @@ describe Instructeurs::DossiersController, type: :controller do
before { allow(dossier).to receive(:after_accepter) }
subject { post :terminer, params: { process_action: "accepter", procedure_id: procedure.id, dossier_id: dossier.id, dossier: { justificatif_motivation: fake_justificatif } }, format: :turbo_stream }
subject { post :terminer, params: { process_action: "accepter", procedure_id: procedure.id, dossier_id: dossier.id, dossier: { justificatif_motivation: fake_justificatif }, statut: 'a-suivre' }, format: :turbo_stream }
it 'does not close it again' do
subject
@ -604,7 +606,7 @@ describe Instructeurs::DossiersController, type: :controller do
subject do
post :pending_correction, params: {
procedure_id: procedure.id, dossier_id: dossier.id,
procedure_id: procedure.id, dossier_id: dossier.id, statut: 'a-suivre',
dossier: { motivation: message, justificatif_motivation: justificatif },
reason:
}, format: :turbo_stream
@ -713,7 +715,7 @@ describe Instructeurs::DossiersController, type: :controller do
describe '#messagerie' do
before { expect(controller.current_instructeur).to receive(:mark_tab_as_seen).with(dossier, :messagerie) }
subject { get :messagerie, params: { procedure_id: procedure.id, dossier_id: dossier.id } }
subject { get :messagerie, params: { procedure_id: procedure.id, dossier_id: dossier.id, statut: 'a-suivre' } }
it { expect(subject).to have_http_status(:ok) }
end
@ -731,7 +733,8 @@ describe Instructeurs::DossiersController, type: :controller do
commentaire: {
body: body,
file: file
}
},
statut: 'a-suivre'
}
}
@ -794,7 +797,8 @@ describe Instructeurs::DossiersController, type: :controller do
post :create_avis, params: {
procedure_id: procedure.id,
dossier_id: dossier.id,
avis: { emails: emails, introduction: 'intro', confidentiel: true, invite_linked_dossiers: invite_linked_dossiers, claimant: instructeur, experts_procedure: experts_procedure }
avis: { emails: emails, introduction: 'intro', confidentiel: true, invite_linked_dossiers: invite_linked_dossiers, claimant: instructeur, experts_procedure: experts_procedure },
statut: 'a-suivre'
}
end
@ -949,6 +953,7 @@ describe Instructeurs::DossiersController, type: :controller do
get :show, params: {
procedure_id: procedure.id,
dossier_id: dossier.id,
statut: 'a-suivre',
format: :pdf
}
end
@ -973,7 +978,7 @@ describe Instructeurs::DossiersController, type: :controller do
context 'with dossier in batch_operation' do
let!(:batch_operation) { create(:batch_operation, operation: :archiver, dossiers: [dossier], instructeur: instructeur) }
it 'assigns variable with true value' do
get :show, params: { procedure_id: procedure.id, dossier_id: dossier.id }
get :show, params: { procedure_id: procedure.id, dossier_id: dossier.id, statut: 'a-suivre' }
expect(assigns(:is_dossier_in_batch_operation)).to eq(true)
end
end
@ -1181,7 +1186,8 @@ describe Instructeurs::DossiersController, type: :controller do
batch_operation
delete :destroy, params: {
procedure_id: procedure.id,
dossier_id: dossier.id
dossier_id: dossier.id,
statut: 'a-suivre'
}
end
@ -1267,7 +1273,7 @@ describe Instructeurs::DossiersController, type: :controller do
end
describe '#extend_conservation' do
subject { post :extend_conservation, params: { procedure_id: procedure.id, dossier_id: dossier.id } }
subject { post :extend_conservation, params: { procedure_id: procedure.id, dossier_id: dossier.id, statut: 'a-suivre' } }
context 'when user logged in' do
it 'works' do
expect(subject).to redirect_to(instructeur_dossier_path(procedure, dossier))
@ -1308,7 +1314,8 @@ describe Instructeurs::DossiersController, type: :controller do
patch :restore,
params: {
procedure_id: procedure.id,
dossier_id: dossier.id
dossier_id: dossier.id,
statut: 'a-suivre'
}
end
@ -1325,7 +1332,7 @@ describe Instructeurs::DossiersController, type: :controller do
end
describe '#extend_conservation and restore' do
subject { post :extend_conservation_and_restore, params: { procedure_id: procedure.id, dossier_id: dossier.id } }
subject { post :extend_conservation_and_restore, params: { procedure_id: procedure.id, dossier_id: dossier.id, statut: 'a-suivre' } }
before do
dossier.update(hidden_by_expired_at: 1.hour.ago, hidden_by_reason: 'expired')
@ -1398,7 +1405,8 @@ describe Instructeurs::DossiersController, type: :controller do
post :reaffectation,
params: {
procedure_id: procedure.id,
dossier_id: dossier.id
dossier_id: dossier.id,
statut: 'a-suivre'
}
end
@ -1423,7 +1431,8 @@ describe Instructeurs::DossiersController, type: :controller do
params: {
procedure_id: procedure.id,
dossier_id: dossier.id,
groupe_instructeur_id: gi_2.id
groupe_instructeur_id: gi_2.id,
statut: 'a-suivre'
}
end
@ -1458,7 +1467,8 @@ describe Instructeurs::DossiersController, type: :controller do
get :personnes_impliquees,
params: {
procedure_id: routed_procedure.id,
dossier_id: dossier.id
dossier_id: dossier.id,
statut: 'a-suivre'
}
end
@ -1514,7 +1524,8 @@ describe Instructeurs::DossiersController, type: :controller do
get :pieces_jointes, params: {
procedure_id: procedure.id,
dossier_id: dossier.id
dossier_id: dossier.id,
statut: 'a-suivre'
}
end
@ -1535,7 +1546,7 @@ describe Instructeurs::DossiersController, type: :controller do
let(:procedure) { create(:procedure, :with_labels, instructeurs: [instructeur]) }
let!(:dossier) { create(:dossier, :en_construction, procedure:) }
context 'it create dossier labels' do
subject { post :dossier_labels, params: { procedure_id: procedure.id, dossier_id: dossier.id, label_id: [Label.first.id] }, format: :turbo_stream }
subject { post :dossier_labels, params: { procedure_id: procedure.id, dossier_id: dossier.id, label_id: [Label.first.id], statut: 'a-suivre' }, format: :turbo_stream }
it 'works' do
subject
dossier.reload
@ -1551,7 +1562,7 @@ describe Instructeurs::DossiersController, type: :controller do
DossierLabel.create(dossier_id: dossier.id, label_id: dossier.procedure.labels.first.id)
end
subject { post :dossier_labels, params: { procedure_id: procedure.id, dossier_id: dossier.id, label_id: [] }, format: :turbo_stream }
subject { post :dossier_labels, params: { procedure_id: procedure.id, dossier_id: dossier.id, label_id: [], statut: 'a-suivre' }, format: :turbo_stream }
it 'works' do
expect(dossier.dossier_labels.count).to eq(1)

2
spec/controllers/instructeurs/procedures_controller_spec.rb
View file

@ -263,7 +263,7 @@ describe Instructeurs::ProceduresController, type: :controller do
let!(:gi_2) { create(:groupe_instructeur, label: '2', procedure: procedure) }
let!(:gi_3) { create(:groupe_instructeur, label: '3', procedure: procedure) }
let(:statut) { nil }
let(:statut) { 'a-suivre' }
subject do
get :show, params: { procedure_id: procedure.id, statut: statut }

6
spec/system/routing/rules_full_scenario_spec.rb
View file

@ -216,7 +216,7 @@ describe 'The routing with rules', js: true do
## on the dossier itself
click_on 'suivi'
click_on litteraire_user.email
expect(page).to have_current_path(instructeur_dossier_path(procedure, litteraire_user.dossiers.first))
expect(page).to have_current_path(instructeur_dossier_path(procedure, litteraire_user.dossiers.first, statut: :suivis))
expect(page).to have_text('Annotations privées')
expect(find('.fr-tabs')).to have_css('span.notifications')
log_out
@ -231,7 +231,7 @@ describe 'The routing with rules', js: true do
# the instructeurs who belong to scientifique AND litteraire groups manage scientifique and litteraire dossiers
register_instructeur_and_log_in(alain.email)
visit instructeur_procedure_path(procedure, params: { statut: 'tous' })
visit instructeur_procedure_path(procedure, statut: 'tous')
expect(page).to have_text(litteraire_user.email)
expect(page).to have_text(scientifique_user.email)
@ -239,7 +239,7 @@ describe 'The routing with rules', js: true do
click_on scientifique_user.email
click_on 'Suivre le dossier'
visit instructeur_procedure_path(procedure, params: { statut: 'tous' })
visit instructeur_procedure_path(procedure, statut: 'tous')
click_on litteraire_user.email
click_on 'Suivre le dossier'
log_out

1
spec/views/instructeur/dossiers/_instruction_button_motivation.html.haml_spec.rb
View file

@ -4,6 +4,7 @@ describe 'instructeurs/dossiers/instruction_button_motivation', type: :view do
let(:dossier) { create(:dossier, :en_instruction) }
subject do
allow(controller).to receive(:params).and_return(statut: 'a-suivre')
render(
'instructeurs/dossiers/instruction_button_motivation',
dossier: dossier,

1
spec/views/instructeur/dossiers/annotations_privee.html.haml_spec.rb
View file

@ -7,6 +7,7 @@ describe 'instructeurs/dossiers/annotations_privees', type: :view do
before do
sign_in(current_instructeur.user)
allow(view).to receive(:current_instructeur).and_return(current_instructeur)
allow(controller).to receive(:params).and_return({ statut: 'a-suivre' })
assign(:dossier, dossier)
end

1
spec/views/instructeur/dossiers/show.html.haml_spec.rb
View file

@ -7,6 +7,7 @@ describe 'instructeurs/dossiers/show', type: :view do
before do
sign_in(current_instructeur.user)
allow(view).to receive(:current_instructeur).and_return(current_instructeur)
allow(controller).to receive(:params).and_return(statut: 'a-suivre')
assign(:dossier, dossier)
end

5
spec/views/shared/avis/list.html.haml_spec.rb
View file

@ -1,7 +1,10 @@
# frozen_string_literal: true
describe 'shared/avis/_list', type: :view do
before { view.extend DossierHelper }
before do
view.extend DossierHelper
allow(view).to receive(:params).and_return({ statut: 'a-suivre' })
end
subject { render 'shared/avis/list', avis: avis, avis_seen_at: seen_at, expert_or_instructeur: instructeur }