diff --git a/app/assets/images/logo-france-connect.png b/app/assets/images/logo-france-connect.png deleted file mode 100644 index c33a34723..000000000 Binary files a/app/assets/images/logo-france-connect.png and /dev/null differ diff --git a/app/views/dossiers/show.pdf.prawn b/app/views/dossiers/show.pdf.prawn index da7d7f360..36c1c6329 100644 --- a/app/views/dossiers/show.pdf.prawn +++ b/app/views/dossiers/show.pdf.prawn @@ -188,9 +188,6 @@ prawn_document(page_size: "A4") do |pdf| add_title(pdf, "Identité du demandeur") - if @dossier.user.france_connect_information.present? - format_in_2_columns(pdf, 'Informations France Connect', "Le dossier a été déposé par le compte de #{@dossier.individual.prenom} #{@dossier.individual.nom}, authentifié par France Connect le #{@dossier.individual.updated_at.strftime('%d/%m/%Y')}") - end format_in_2_columns(pdf, "Email", @dossier.user.email) add_identite_individual(pdf, @dossier) if @dossier.individual.present? render_identite_etablissement(pdf, @dossier.etablissement) if @dossier.etablissement.present? diff --git a/app/views/shared/dossiers/_demande.html.haml b/app/views/shared/dossiers/_demande.html.haml index 4328a907a..55870541c 100644 --- a/app/views/shared/dossiers/_demande.html.haml +++ b/app/views/shared/dossiers/_demande.html.haml @@ -5,8 +5,6 @@ .tab-title Identité du demandeur .card - - if dossier.user.france_connect_information.present? - = render partial: "shared/dossiers/france_connect_informations", locals: { individual: dossier.individual } = render partial: "shared/dossiers/user_infos", locals: { user: dossier.user } - if dossier.etablissement.present? diff --git a/app/views/shared/dossiers/_edit.html.haml b/app/views/shared/dossiers/_edit.html.haml index a3db1492a..a8a420e3f 100644 --- a/app/views/shared/dossiers/_edit.html.haml +++ b/app/views/shared/dossiers/_edit.html.haml @@ -21,8 +21,7 @@ Votre dossier est enregistré automatiquement après chaque modification. Vous pouvez à tout moment fermer la fenêtre et reprendre plus tard là où vous en étiez. - else Pour enregistrer votre dossier et le reprendre plus tard, cliquez sur le bouton « Enregistrer le brouillon » en bas à gauche du formulaire. - - if !apercu && dossier.user.france_connect_information.present? - = render partial: "shared/dossiers/france_connect_informations", locals: { individual: dossier.individual } + - if notice_url(dossier.procedure).present? = link_to notice_url(dossier.procedure), target: '_blank', rel: 'noopener', class: 'button notice', title: "Pour vous aider à remplir votre dossier, vous pouvez consulter le guide de cette démarche." do %span.icon.info> diff --git a/app/views/shared/dossiers/_france_connect_informations.html.haml b/app/views/shared/dossiers/_france_connect_informations.html.haml deleted file mode 100644 index 125bbbb96..000000000 --- a/app/views/shared/dossiers/_france_connect_informations.html.haml +++ /dev/null @@ -1,4 +0,0 @@ -.card.featured - .flex.justify-center - = image_tag "logo-france-connect.png", alt: "France Connect logo", width: 200, class: "mb-2" - .card-title Le dossier a été déposé par le compte de #{individual.prenom} #{individual.nom}, authentifié par France Connect le #{individual.updated_at.strftime('%d/%m/%Y')}. diff --git a/spec/features/france_connect/france_connect_particulier_spec.rb b/spec/features/france_connect/france_connect_particulier_spec.rb index 37a5171c3..123a10d7d 100644 --- a/spec/features/france_connect/france_connect_particulier_spec.rb +++ b/spec/features/france_connect/france_connect_particulier_spec.rb @@ -68,10 +68,6 @@ feature 'France Connect Particulier Connexion' do scenario 'he is redirected to user dossiers page' do expect(page).to have_content('Dossiers') end - - scenario 'the updated_at date is well updated' do - expect(france_connect_information.updated_at).not_to eq(france_connect_information.created_at) - end end end diff --git a/spec/views/instructeur/dossiers/show.html.haml_spec.rb b/spec/views/instructeur/dossiers/show.html.haml_spec.rb index 48863d240..25072b3e5 100644 --- a/spec/views/instructeur/dossiers/show.html.haml_spec.rb +++ b/spec/views/instructeur/dossiers/show.html.haml_spec.rb @@ -18,19 +18,4 @@ describe 'instructeurs/dossiers/show.html.haml', type: :view do expect(rendered).to have_text('Identité') expect(rendered).to have_text('Demande') end - - context 'when the user is logged in with france connect' do - let(:france_connect_information) { build(:france_connect_information) } - let(:user) { build(:user, france_connect_information: france_connect_information) } - let(:procedure1) { create(:procedure, :with_type_de_champ, for_individual: true) } - let(:dossier) { create(:dossier, procedure: procedure1, user: user) } - - before do - render - end - - it 'fills the individual with the informations from France Connect' do - expect(rendered).to have_text("Le dossier a été déposé par le compte de #{dossier.individual.prenom} #{dossier.individual.nom}, authentifié par France Connect le #{dossier.individual.updated_at.strftime('%d/%m/%Y')}") - end - end end diff --git a/spec/views/users/dossiers/demande.html.haml_spec.rb b/spec/views/users/dossiers/demande.html.haml_spec.rb index a203fc83b..0a46903d4 100644 --- a/spec/views/users/dossiers/demande.html.haml_spec.rb +++ b/spec/views/users/dossiers/demande.html.haml_spec.rb @@ -33,19 +33,4 @@ describe 'users/dossiers/demande.html.haml', type: :view do it { expect(rendered).not_to have_text('Déposé le') } end - - context 'when the user is logged in with france connect' do - let(:france_connect_information) { build(:france_connect_information) } - let(:user) { build(:user, france_connect_information: france_connect_information) } - let(:procedure1) { create(:procedure, :with_type_de_champ, for_individual: true) } - let(:dossier) { create(:dossier, procedure: procedure1, user: user) } - - before do - render - end - - it 'fills the individual with the informations from France Connect' do - expect(rendered).to have_text("Le dossier a été déposé par le compte de #{dossier.individual.prenom} #{dossier.individual.nom}, authentifié par France Connect le #{dossier.individual.updated_at.strftime('%d/%m/%Y')}") - end - end end