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

Merge pull request #5996 from betagouv/fix-dossier-link

Browse source 
fix dossier link helper
This commit is contained in:
Kara Diaby 2021-03-18 14:50:58 +01:00 committed by GitHub
commit 806469d72e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/helpers/dossier_link_helper.rb
View file

@ -4,11 +4,6 @@ module DossierLinkHelper
if user.groupe_instructeurs.include?(dossier.groupe_instructeur) if user.groupe_instructeurs.include?(dossier.groupe_instructeur)
instructeur_dossier_path(dossier.procedure, dossier) instructeur_dossier_path(dossier.procedure, dossier)
end end
elsif user.is_a?(Expert)
avis = dossier.avis.find_by(expert: user.user)
if avis.present?
expert_avis_path(avis.procedure, avis)
end
elsif user.owns_or_invite?(dossier) elsif user.owns_or_invite?(dossier)
dossier_path(dossier) dossier_path(dossier)
end end

13
spec/features/instructeurs/expert_spec.rb
View file

@ -4,6 +4,7 @@ feature 'Inviting an expert:' do
let(:instructeur) { create(:instructeur, password: 'my-s3cure-p4ssword') } let(:instructeur) { create(:instructeur, password: 'my-s3cure-p4ssword') }
let(:expert) { create(:expert, password: expert_password) } let(:expert) { create(:expert, password: expert_password) }
let(:expert2) { create(:expert, password: expert_password) }
let(:expert_password) { 'mot de passe d’expert' } let(:expert_password) { 'mot de passe d’expert' }
let(:procedure) { create(:procedure, :published, instructeurs: [instructeur]) } let(:procedure) { create(:procedure, :published, instructeurs: [instructeur]) }
let(:dossier) { create(:dossier, :en_construction, :with_dossier_link, procedure: procedure) } let(:dossier) { create(:dossier, :en_construction, :with_dossier_link, procedure: procedure) }
@ -20,7 +21,7 @@ feature 'Inviting an expert:' do
click_on 'Avis externes' click_on 'Avis externes'
expect(page).to have_current_path(avis_instructeur_dossier_path(procedure, dossier)) expect(page).to have_current_path(avis_instructeur_dossier_path(procedure, dossier))
fill_in 'avis_emails', with: 'expert1@expert.com, expert2@expert.com' fill_in 'avis_emails', with: "#{expert.email}, #{expert2.email}"
fill_in 'avis_introduction', with: 'Bonjour, merci de me donner votre avis sur ce dossier.' fill_in 'avis_introduction', with: 'Bonjour, merci de me donner votre avis sur ce dossier.'
check 'avis_invite_linked_dossiers' check 'avis_invite_linked_dossiers'
page.select 'confidentiel', from: 'avis_confidentiel' page.select 'confidentiel', from: 'avis_confidentiel'
@ -31,16 +32,16 @@ feature 'Inviting an expert:' do
expect(page).to have_content('Une demande d\'avis a été envoyée') expect(page).to have_content('Une demande d\'avis a été envoyée')
expect(page).to have_content('Avis des invités') expect(page).to have_content('Avis des invités')
within('.list-avis') do within('.list-avis') do
expect(page).to have_content('expert1@expert.com') expect(page).to have_content(expert.email.to_s)
expect(page).to have_content('expert2@expert.com') expect(page).to have_content(expert2.email.to_s)
expect(page).to have_content('Bonjour, merci de me donner votre avis sur ce dossier.') expect(page).to have_content('Bonjour, merci de me donner votre avis sur ce dossier.')
end end
expect(Avis.count).to eq(4) expect(Avis.count).to eq(4)
expect(emails_sent_to('expert1@expert.com').size).to eq(1) expect(emails_sent_to(expert.email.to_s).size).to eq(1)
expect(emails_sent_to('expert2@expert.com').size).to eq(1) expect(emails_sent_to(expert2.email.to_s).size).to eq(1)
invitation_email = open_email('expert1@expert.com') invitation_email = open_email(expert.email.to_s)
avis = Avis.find_by(expert: expert.id) avis = Avis.find_by(expert: expert.id)
sign_up_link = sign_up_expert_avis_path(avis.dossier.procedure, avis, avis.expert.email) sign_up_link = sign_up_expert_avis_path(avis.dossier.procedure, avis, avis.expert.email)
expect(invitation_email.body).to include(sign_up_link) expect(invitation_email.body).to include(sign_up_link)

9
spec/helpers/dossier_link_helper_spec.rb
View file

@ -24,15 +24,6 @@ describe DossierLinkHelper do
it { expect(helper.dossier_linked_path(instructeur, dossier)).to eq(instructeur_dossier_path(dossier.procedure, dossier)) } it { expect(helper.dossier_linked_path(instructeur, dossier)).to eq(instructeur_dossier_path(dossier.procedure, dossier)) }
end end
context "when access as expert" do
let(:dossier) { create(:dossier) }
let(:instructeur) { create(:instructeur) }
let(:expert) { create(:expert) }
let!(:experts_procedure) { ExpertsProcedure.create(expert: expert, procedure: dossier.procedure) }
let!(:avis) { create(:avis, dossier: dossier, claimant: instructeur, experts_procedure: experts_procedure) }
it { expect(helper.dossier_linked_path(expert, dossier)).to eq(expert_avis_path(avis.dossier.procedure, avis)) }
end
context "when access as user" do context "when access as user" do
let(:dossier) { create(:dossier) } let(:dossier) { create(:dossier) }
let(:user) { create(:user) } let(:user) { create(:user) }