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

Merge branch 'main' of github.com:betagouv/demarches-simplifiees.fr into instructeur-invitation-include-typo-suggestion-ldu

Browse source
This commit is contained in:
Lisa Durand 2024-07-10 14:58:55 +02:00
commit 42633c0012
No known key found for this signature in database
GPG key ID: 0DF91F2CA1E8B816
138 changed files with 2056 additions and 3526 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spec/controllers/administrateurs/experts_procedures_controller_spec.rb
View file

@ -26,7 +26,7 @@ describe Administrateurs::ExpertsProceduresController, type: :controller do
subject { post :create, params: params }
context 'when inviting multiple valid experts' do
let(:params) { { procedure_id: procedure.id, emails: [expert.email, "new@expert.fr"].to_json } }
let(:params) { { procedure_id: procedure.id, emails: [expert.email, "new@expert.fr"] } }
it 'creates experts' do
subject
@ -38,7 +38,7 @@ describe Administrateurs::ExpertsProceduresController, type: :controller do
end
context 'when inviting expert using an email with typos' do
let(:params) { { procedure_id: procedure.id, emails: ['martin@oraneg.fr'].to_json } }
let(:params) { { procedure_id: procedure.id, emails: ['martin@oraneg.fr'] } }
render_views
it 'warns' do
subject

8
spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
View file

@ -332,14 +332,14 @@ describe Administrateurs::GroupeInstructeursController, type: :controller do
describe '#add_instructeur_procedure_non_routee' do
# faire la meme chose sur une procedure non routee
let(:procedure_non_routee) { create(:procedure, administrateur: admin) }
let(:emails) { ['instructeur_3@ministere_a.gouv.fr', 'instructeur_4@ministere_b.gouv.fr'].to_json }
let(:emails) { ['instructeur_3@ministere_a.gouv.fr', 'instructeur_4@ministere_b.gouv.fr'] }
let(:manager) { false }
before {
procedure_non_routee.administrateurs_procedures.where(administrateur: admin).update_all(manager:)
}
subject { post :add_instructeur, params: { emails: emails, procedure_id: procedure_non_routee.id, id: procedure_non_routee.defaut_groupe_instructeur.id } }
context 'when all emails are valid' do
let(:emails) { ['test@b.gouv.fr', 'test2@b.gouv.fr'].to_json }
let(:emails) { ['test@b.gouv.fr', 'test2@b.gouv.fr'] }
it do
expect(subject).to render_template(:index)
expect(subject.request.flash[:alert]).to be_nil
@ -348,7 +348,7 @@ describe Administrateurs::GroupeInstructeursController, type: :controller do
end
context 'when there is at least one bad email' do
let(:emails) { ['badmail', 'instructeur2@gmail.com'].to_json }
let(:emails) { ['badmail', 'instructeur2@gmail.com'] }
it do
expect(subject).to render_template(:index)
expect(subject.request.flash[:alert]).to be_present
@ -376,7 +376,7 @@ describe Administrateurs::GroupeInstructeursController, type: :controller do
params: {
procedure_id: procedure.id,
id: gi_1_2.id,
emails: new_instructeur_emails.to_json
emails: new_instructeur_emails
}
end

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

@ -13,7 +13,7 @@ describe Administrateurs::ProceduresController, type: :controller do
let(:lien_site_web) { 'http://mon-site.gouv.fr' }
let(:zone) { create(:zone) }
let(:zone_ids) { [zone.id] }
let(:tags) { "[\"planete\",\"environnement\"]" }
let(:tags) { ["planete", "environnement"] }
describe '#apercu' do
subject { get :apercu, params: { id: procedure.id } }