From 6b19432d4701410a835e0e5501fcff6d0d9f8077 Mon Sep 17 00:00:00 2001 From: clemkeirua Date: Thu, 11 Jul 2019 11:49:01 +0200 Subject: [PATCH 1/3] =?UTF-8?q?deplacement=20de=20l'URL=20qui=20envoie=20v?= =?UTF-8?q?ers=20la=20proc=C3=A9dure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin/procedures_controller.rb | 2 ++ app/views/admin/procedures/_informations.html.haml | 7 ++++--- app/views/admin/procedures/_modal_publish.html.haml | 5 +++++ spec/controllers/admin/procedures_controller_spec.rb | 7 ++++++- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/procedures_controller.rb b/app/controllers/admin/procedures_controller.rb index 448df9f3c6a..8372a2535e3 100644 --- a/app/controllers/admin/procedures_controller.rb +++ b/app/controllers/admin/procedures_controller.rb @@ -110,6 +110,8 @@ def publish procedure = current_administrateur.procedures.find(params[:procedure_id]) procedure.path = path + procedure.lien_site_web = params[:lien_site_web] + if !procedure.validate flash.alert = 'Lien de la démarche invalide' return redirect_to admin_procedures_path diff --git a/app/views/admin/procedures/_informations.html.haml b/app/views/admin/procedures/_informations.html.haml index 7c1b8ad31b2..437e83dd463 100644 --- a/app/views/admin/procedures/_informations.html.haml +++ b/app/views/admin/procedures/_informations.html.haml @@ -19,9 +19,10 @@ = f.label :duree_conservation_dossiers_hors_ds, "Hors demarches-simplifiees.fr* (durée en mois après la fin de l'instruction)" = f.number_field :duree_conservation_dossiers_hors_ds, class: 'form-control', placeholder: '6', required: true -.form-group - %h4 Où les usagers trouveront-ils le lien vers la démarche ? - = f.text_field :lien_site_web, class: 'form-control', placeholder: 'https://exemple.gouv.fr/ma_demarche' +- if @procedure.locked? + .form-group + %h4 Où les usagers trouveront-ils le lien vers la démarche ? + = f.text_field :lien_site_web, class: 'form-control', placeholder: 'https://exemple.gouv.fr/ma_demarche' .form-group %h4 Cadre juridique * diff --git a/app/views/admin/procedures/_modal_publish.html.haml b/app/views/admin/procedures/_modal_publish.html.haml index 202f1f6bd25..0df3e7bf95b 100644 --- a/app/views/admin/procedures/_modal_publish.html.haml +++ b/app/views/admin/procedures/_modal_publish.html.haml @@ -38,6 +38,11 @@ "https://vimeo.com/334463514", target: "_blank" + .form-group + %h4 Où les usagers trouveront-ils le lien vers cette démarche ? + %p.center + = text_field_tag(:lien_site_web, @procedure.lien_site_web, class: 'form-control', placeholder: 'https://exemple.gouv.fr/ma_demarche') + #path-messages #path_is_mine.text-warning.center.message Ce lien est déjà utilisé par une de vos démarche. diff --git a/spec/controllers/admin/procedures_controller_spec.rb b/spec/controllers/admin/procedures_controller_spec.rb index 4acaf3531a6..4ec06a29665 100644 --- a/spec/controllers/admin/procedures_controller_spec.rb +++ b/spec/controllers/admin/procedures_controller_spec.rb @@ -334,10 +334,11 @@ def update_procedure let(:procedure) { create(:procedure, administrateur: admin) } let(:procedure2) { create(:procedure, :published, administrateur: admin) } let(:procedure3) { create(:procedure, :published) } + let(:lien_site_web) { 'http://some.administration/' } context 'when admin is the owner of the procedure' do before do - put :publish, params: { procedure_id: procedure.id, path: path } + put :publish, params: { procedure_id: procedure.id, path: path, lien_site_web: lien_site_web } procedure.reload procedure2.reload end @@ -348,6 +349,7 @@ def update_procedure it 'publish the given procedure' do expect(procedure.publiee?).to be_truthy expect(procedure.path).to eq(path) + expect(procedure.lien_site_web).to eq(lien_site_web) expect(response.status).to eq 302 expect(flash[:notice]).to have_content 'Démarche publiée' end @@ -359,6 +361,7 @@ def update_procedure it 'publish the given procedure' do expect(procedure.publiee?).to be_truthy expect(procedure.path).to eq(path) + expect(procedure.lien_site_web).to eq(lien_site_web) expect(response.status).to eq 302 expect(flash[:notice]).to have_content 'Démarche publiée' end @@ -375,6 +378,7 @@ def update_procedure it 'does not publish the given procedure' do expect(procedure.publiee?).to be_falsey expect(procedure.path).not_to match(path) + expect(procedure.lien_site_web).not_to match(lien_site_web) expect(response.status).to eq 200 end @@ -391,6 +395,7 @@ def update_procedure it 'does not publish the given procedure' do expect(procedure.publiee?).to be_falsey expect(procedure.path).not_to match(path) + expect(procedure.lien_site_web).not_to match(lien_site_web) expect(response).to redirect_to :admin_procedures expect(flash[:alert]).to have_content 'Lien de la démarche invalide' end From 6f4765530150b30bf8b88c292e3c77d4ea94cc87 Mon Sep 17 00:00:00 2001 From: clemkeirua Date: Thu, 11 Jul 2019 16:07:00 +0200 Subject: [PATCH 2/3] rendu lien_site_web obligatoire au moment de la publication --- .../admin/procedures_controller.rb | 7 ++--- app/models/procedure.rb | 22 +++++++--------- .../admin/procedures/_informations.html.haml | 2 +- .../admin/procedures/_modal_publish.html.haml | 7 +++-- .../admin/procedures_controller_spec.rb | 26 ++++++++++++++----- spec/factories/procedure.rb | 9 ++++--- spec/models/procedure_spec.rb | 2 +- 7 files changed, 45 insertions(+), 30 deletions(-) diff --git a/app/controllers/admin/procedures_controller.rb b/app/controllers/admin/procedures_controller.rb index 8372a2535e3..ff30244646f 100644 --- a/app/controllers/admin/procedures_controller.rb +++ b/app/controllers/admin/procedures_controller.rb @@ -107,19 +107,20 @@ def update def publish path = params[:path] + lien_site_web = params[:lien_site_web] procedure = current_administrateur.procedures.find(params[:procedure_id]) procedure.path = path - procedure.lien_site_web = params[:lien_site_web] + procedure.lien_site_web = lien_site_web if !procedure.validate - flash.alert = 'Lien de la démarche invalide' + flash.alert = 'Lien de la démarche invalide ou lien vers la démarche manquant' return redirect_to admin_procedures_path else procedure.path = nil end - if procedure.publish_or_reopen!(current_administrateur, path) + if procedure.publish_or_reopen!(current_administrateur, path, lien_site_web) flash.notice = "Démarche publiée" redirect_to admin_procedures_path else diff --git a/app/models/procedure.rb b/app/models/procedure.rb index 4f36161ddb8..9ec30cef605 100644 --- a/app/models/procedure.rb +++ b/app/models/procedure.rb @@ -107,12 +107,12 @@ class Procedure < ApplicationRecord end end - def publish_or_reopen!(administrateur, path) - if archivee? && may_reopen?(administrateur, path) - reopen!(administrateur, path) - elsif may_publish?(administrateur, path) + def publish_or_reopen!(administrateur, path, lien_site_web) + if archivee? && may_reopen?(administrateur, path, lien_site_web) + reopen!(administrateur, path, lien_site_web) + elsif may_publish?(administrateur, path, lien_site_web) reset! - publish!(administrateur, path) + publish!(administrateur, path, lien_site_web) end end @@ -488,21 +488,17 @@ def claim_path_ownership!(path) update!(path: path) end - def can_publish?(administrateur, path) - path_availability(administrateur, path).in?(PATH_CAN_PUBLISH) + def can_publish?(administrateur, path, lien_site_web) + path_availability(administrateur, path).in?(PATH_CAN_PUBLISH) && lien_site_web.present? end - def can_reopen?(administrateur, path) - path_availability(administrateur, path).in?(PATH_CAN_PUBLISH) - end - - def after_publish(administrateur, path) + def after_publish(administrateur, path, lien_site_web) update!(published_at: Time.zone.now) claim_path_ownership!(path) end - def after_reopen(administrateur, path) + def after_reopen(administrateur, path, lien_site_web) update!(published_at: Time.zone.now, archived_at: nil) claim_path_ownership!(path) diff --git a/app/views/admin/procedures/_informations.html.haml b/app/views/admin/procedures/_informations.html.haml index 437e83dd463..c2d1477a22c 100644 --- a/app/views/admin/procedures/_informations.html.haml +++ b/app/views/admin/procedures/_informations.html.haml @@ -19,7 +19,7 @@ = f.label :duree_conservation_dossiers_hors_ds, "Hors demarches-simplifiees.fr* (durée en mois après la fin de l'instruction)" = f.number_field :duree_conservation_dossiers_hors_ds, class: 'form-control', placeholder: '6', required: true -- if @procedure.locked? +- if @procedure.new? .form-group %h4 Où les usagers trouveront-ils le lien vers la démarche ? = f.text_field :lien_site_web, class: 'form-control', placeholder: 'https://exemple.gouv.fr/ma_demarche' diff --git a/app/views/admin/procedures/_modal_publish.html.haml b/app/views/admin/procedures/_modal_publish.html.haml index 0df3e7bf95b..102e0c23416 100644 --- a/app/views/admin/procedures/_modal_publish.html.haml +++ b/app/views/admin/procedures/_modal_publish.html.haml @@ -39,9 +39,12 @@ target: "_blank" .form-group - %h4 Où les usagers trouveront-ils le lien vers cette démarche ? + %h4 Où les usagers trouveront-ils le lien vers cette démarche ? * %p.center - = text_field_tag(:lien_site_web, @procedure.lien_site_web, class: 'form-control', placeholder: 'https://exemple.gouv.fr/ma_demarche') + = text_field_tag(:lien_site_web, @procedure.lien_site_web, + required: true, + class: 'form-control', + placeholder: 'https://exemple.gouv.fr/ma_demarche') #path-messages #path_is_mine.text-warning.center.message diff --git a/spec/controllers/admin/procedures_controller_spec.rb b/spec/controllers/admin/procedures_controller_spec.rb index 4ec06a29665..6f22b7ad317 100644 --- a/spec/controllers/admin/procedures_controller_spec.rb +++ b/spec/controllers/admin/procedures_controller_spec.rb @@ -15,6 +15,7 @@ let(:duree_conservation_dossiers_dans_ds) { 3 } let(:duree_conservation_dossiers_hors_ds) { 6 } let(:monavis_embed) { nil } + let(:lien_site_web) { 'http://mon-site.gouv.fr' } let(:procedure_params) { { @@ -26,7 +27,8 @@ cadre_juridique: cadre_juridique, duree_conservation_dossiers_dans_ds: duree_conservation_dossiers_dans_ds, duree_conservation_dossiers_hors_ds: duree_conservation_dossiers_hors_ds, - monavis_embed: monavis_embed + monavis_embed: monavis_embed, + lien_site_web: lien_site_web } } @@ -331,9 +333,10 @@ def update_procedure end describe 'PUT #publish' do - let(:procedure) { create(:procedure, administrateur: admin) } - let(:procedure2) { create(:procedure, :published, administrateur: admin) } - let(:procedure3) { create(:procedure, :published) } + let(:lien_site_web) { 'http://mon-site.gouv.fr' } + let(:procedure) { create(:procedure, administrateur: admin, lien_site_web: nil) } + let(:procedure2) { create(:procedure, :published, administrateur: admin, lien_site_web: lien_site_web) } + let(:procedure3) { create(:procedure, :published, lien_site_web: lien_site_web) } let(:lien_site_web) { 'http://some.administration/' } context 'when admin is the owner of the procedure' do @@ -400,6 +403,17 @@ def update_procedure expect(flash[:alert]).to have_content 'Lien de la démarche invalide' end end + + context 'procedure path is valid but lien_site_web is missing' do + let(:path) { 'new_path' } + let(:lien_site_web) { nil } + + it 'does not publish the given procedure' do + expect(procedure.publiee?).to be_falsey + expect(flash[:alert]).to have_content 'Lien de la démarche invalide' + expect(response).to redirect_to :admin_procedures + end + end end context 'when admin is not the owner of the procedure' do @@ -421,7 +435,7 @@ def update_procedure end describe 'PUT #archive' do - let(:procedure) { create(:procedure, :published, administrateur: admin) } + let(:procedure) { create(:procedure, :published, administrateur: admin, lien_site_web: lien_site_web) } context 'when admin is the owner of the procedure' do before do @@ -437,7 +451,7 @@ def update_procedure context 'when owner want to re-enable procedure' do before do - put :publish, params: { procedure_id: procedure.id, path: 'fake_path' } + put :publish, params: { procedure_id: procedure.id, path: 'fake_path', lien_site_web: lien_site_web } procedure.reload end diff --git a/spec/factories/procedure.rb b/spec/factories/procedure.rb index 2e5bd901d05..cc9be67ecfb 100644 --- a/spec/factories/procedure.rb +++ b/spec/factories/procedure.rb @@ -10,6 +10,7 @@ duree_conservation_dossiers_dans_ds { 3 } duree_conservation_dossiers_hors_ds { 6 } ask_birthday { false } + lien_site_web { "https://mon-site.gouv" } transient do administrateur {} @@ -147,13 +148,13 @@ trait :published do after(:build) do |procedure, _evaluator| - procedure.publish!(procedure.administrateurs.first, generate(:published_path)) + procedure.publish!(procedure.administrateurs.first, generate(:published_path), procedure.lien_site_web) end end trait :archived do after(:build) do |procedure, _evaluator| - procedure.publish!(procedure.administrateurs.first, generate(:published_path)) + procedure.publish!(procedure.administrateurs.first, generate(:published_path), procedure.lien_site_web) procedure.archive! end end @@ -162,14 +163,14 @@ # For now the behavior is the same than :archived # (it may be different in the future though) after(:build) do |procedure, _evaluator| - procedure.publish!(procedure.administrateurs.first, generate(:published_path)) + procedure.publish!(procedure.administrateurs.first, generate(:published_path), procedure.lien_site_web) procedure.archive! end end trait :hidden do after(:build) do |procedure, _evaluator| - procedure.publish!(procedure.administrateurs.first, generate(:published_path)) + procedure.publish!(procedure.administrateurs.first, generate(:published_path), procedure.lien_site_web) procedure.hide! end end diff --git a/spec/models/procedure_spec.rb b/spec/models/procedure_spec.rb index 81f94e50027..d677a93bb1a 100644 --- a/spec/models/procedure_spec.rb +++ b/spec/models/procedure_spec.rb @@ -554,7 +554,7 @@ before do Timecop.freeze(now) - procedure.publish!(procedure.administrateurs.first, "example-path") + procedure.publish!(procedure.administrateurs.first, "example-path", procedure.lien_site_web) end after { Timecop.return } From 314b0f5dc0d04fac05579bf85a09e8cf882be18f Mon Sep 17 00:00:00 2001 From: clemkeirua Date: Tue, 23 Jul 2019 12:09:48 +0200 Subject: [PATCH 3/3] fix tests --- .../admin/procedures/_informations.html.haml | 2 +- .../admin/procedures_controller_spec.rb | 37 +++++++++++-------- spec/factories/procedure.rb | 2 +- .../features/admin/procedure_creation_spec.rb | 1 + .../admin/procedures/edit.html.haml_spec.rb | 2 +- .../admin/procedures/show.html.haml_spec.rb | 4 +- 6 files changed, 28 insertions(+), 20 deletions(-) diff --git a/app/views/admin/procedures/_informations.html.haml b/app/views/admin/procedures/_informations.html.haml index c2d1477a22c..2ff2e84b2bb 100644 --- a/app/views/admin/procedures/_informations.html.haml +++ b/app/views/admin/procedures/_informations.html.haml @@ -19,7 +19,7 @@ = f.label :duree_conservation_dossiers_hors_ds, "Hors demarches-simplifiees.fr* (durée en mois après la fin de l'instruction)" = f.number_field :duree_conservation_dossiers_hors_ds, class: 'form-control', placeholder: '6', required: true -- if @procedure.new? +- if @procedure.created_at.present? .form-group %h4 Où les usagers trouveront-ils le lien vers la démarche ? = f.text_field :lien_site_web, class: 'form-control', placeholder: 'https://exemple.gouv.fr/ma_demarche' diff --git a/spec/controllers/admin/procedures_controller_spec.rb b/spec/controllers/admin/procedures_controller_spec.rb index 6f22b7ad317..82490bdd2d3 100644 --- a/spec/controllers/admin/procedures_controller_spec.rb +++ b/spec/controllers/admin/procedures_controller_spec.rb @@ -333,8 +333,7 @@ def update_procedure end describe 'PUT #publish' do - let(:lien_site_web) { 'http://mon-site.gouv.fr' } - let(:procedure) { create(:procedure, administrateur: admin, lien_site_web: nil) } + let(:procedure) { create(:procedure, administrateur: admin, lien_site_web: lien_site_web) } let(:procedure2) { create(:procedure, :published, administrateur: admin, lien_site_web: lien_site_web) } let(:procedure3) { create(:procedure, :published, lien_site_web: lien_site_web) } let(:lien_site_web) { 'http://some.administration/' } @@ -348,6 +347,7 @@ def update_procedure context 'procedure path does not exist' do let(:path) { 'new_path' } + let(:lien_site_web) { 'http://mon-site.gouv.fr' } it 'publish the given procedure' do expect(procedure.publiee?).to be_truthy @@ -360,6 +360,7 @@ def update_procedure context 'procedure path exists and is owned by current administrator' do let(:path) { procedure2.path } + let(:lien_site_web) { 'http://mon-site.gouv.fr' } it 'publish the given procedure' do expect(procedure.publiee?).to be_truthy @@ -377,11 +378,12 @@ def update_procedure context 'procedure path exists and is not owned by current administrator' do let(:path) { procedure3.path } + let(:lien_site_web) { 'http://mon-site.gouv.fr' } it 'does not publish the given procedure' do expect(procedure.publiee?).to be_falsey expect(procedure.path).not_to match(path) - expect(procedure.lien_site_web).not_to match(lien_site_web) + expect(procedure.lien_site_web).to match(lien_site_web) expect(response.status).to eq 200 end @@ -394,26 +396,16 @@ def update_procedure context 'procedure path is invalid' do let(:path) { 'Invalid Procedure Path' } + let(:lien_site_web) { 'http://mon-site.gouv.fr' } it 'does not publish the given procedure' do expect(procedure.publiee?).to be_falsey expect(procedure.path).not_to match(path) - expect(procedure.lien_site_web).not_to match(lien_site_web) + expect(procedure.lien_site_web).to match(lien_site_web) expect(response).to redirect_to :admin_procedures expect(flash[:alert]).to have_content 'Lien de la démarche invalide' end end - - context 'procedure path is valid but lien_site_web is missing' do - let(:path) { 'new_path' } - let(:lien_site_web) { nil } - - it 'does not publish the given procedure' do - expect(procedure.publiee?).to be_falsey - expect(flash[:alert]).to have_content 'Lien de la démarche invalide' - expect(response).to redirect_to :admin_procedures - end - end end context 'when admin is not the owner of the procedure' do @@ -432,6 +424,21 @@ def update_procedure expect(flash[:alert]).to have_content 'Démarche inexistante' end end + + context 'when the admin does not provide a lien_site_web' do + before do + put :publish, params: { procedure_id: procedure.id, path: path, lien_site_web: lien_site_web } + procedure.reload + end + context 'procedure path is valid but lien_site_web is missing' do + let(:path) { 'new_path2' } + let(:lien_site_web) { nil } + + it 'does not publish the given procedure' do + expect(procedure.publiee?).to be_falsey + end + end + end end describe 'PUT #archive' do diff --git a/spec/factories/procedure.rb b/spec/factories/procedure.rb index cc9be67ecfb..88bc8faa99f 100644 --- a/spec/factories/procedure.rb +++ b/spec/factories/procedure.rb @@ -38,7 +38,7 @@ after(:build) do |procedure, _evaluator| procedure.for_individual = true procedure.types_de_champ << create(:type_de_champ, libelle: 'Texte obligatoire', mandatory: true) - procedure.publish!(procedure.administrateurs.first, generate(:published_path)) + procedure.publish!(procedure.administrateurs.first, generate(:published_path), procedure.lien_site_web) end end diff --git a/spec/features/admin/procedure_creation_spec.rb b/spec/features/admin/procedure_creation_spec.rb index 8ff486f9079..83f11a2364c 100644 --- a/spec/features/admin/procedure_creation_spec.rb +++ b/spec/features/admin/procedure_creation_spec.rb @@ -123,6 +123,7 @@ within '#publish-modal' do expect(page).to have_field('procedure_path') + fill_in 'lien_site_web', with: 'http://some.website' click_on 'publish' end diff --git a/spec/views/admin/procedures/edit.html.haml_spec.rb b/spec/views/admin/procedures/edit.html.haml_spec.rb index 28d4cc71be5..cb09b0ba399 100644 --- a/spec/views/admin/procedures/edit.html.haml_spec.rb +++ b/spec/views/admin/procedures/edit.html.haml_spec.rb @@ -2,7 +2,7 @@ describe 'admin/procedures/edit.html.haml', type: :view, vcr: { cassette_name: 'admin_procedure_edit' } do let(:logo) { Rack::Test::UploadedFile.new("./spec/fixtures/files/logo_test_procedure.png", 'image/png') } - let(:procedure) { create(:procedure, logo: logo) } + let(:procedure) { create(:procedure, logo: logo, lien_site_web: 'http://some.website') } before do assign(:procedure, procedure) diff --git a/spec/views/admin/procedures/show.html.haml_spec.rb b/spec/views/admin/procedures/show.html.haml_spec.rb index 57715a9a7d2..9c5c8deef35 100644 --- a/spec/views/admin/procedures/show.html.haml_spec.rb +++ b/spec/views/admin/procedures/show.html.haml_spec.rb @@ -41,7 +41,7 @@ describe 'procedure is published' do before do - procedure.publish!(procedure.administrateurs.first, 'fake_path') + procedure.publish!(procedure.administrateurs.first, 'fake_path', procedure.lien_site_web) procedure.reload render end @@ -59,7 +59,7 @@ describe 'procedure is archived' do before do - procedure.publish!(procedure.administrateurs.first, 'fake_path') + procedure.publish!(procedure.administrateurs.first, 'fake_path', procedure.lien_site_web) procedure.archive! procedure.reload render