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

Add path field to procedure information form

Browse source
This commit is contained in:
Paul Chavard 2018-09-19 17:12:12 +02:00
parent f6a6d8f457
commit f94a24d7ce
12 changed files with 176 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ describe Admin::ProceduresController, type: :controller do
let(:bad_procedure_id) { 100000 }
let(:path) { 'ma-jolie-demarche' }
let(:libelle) { 'Démarche de test' }
let(:description) { 'Description de test' }
let(:organisation) { 'Organisation de test' }
@ -20,6 +21,7 @@ describe Admin::ProceduresController, type: :controller do
let(:procedure_params) {
{
path: path,
libelle: libelle,
description: description,
organisation: organisation,

3
spec/features/admin/procedure_cloning_spec.rb
View file

@ -7,6 +7,9 @@ feature 'As an administrateur I wanna clone a procedure', js: true do
let(:administrateur) { create(:administrateur) }
before do
# FIXME: needed to make procedure_path validation work
create(:procedure)
Flipflop::FeatureSet.current.test!.switch!(:publish_draft, true)
login_as administrateur, scope: :administrateur
visit root_path
end

72
spec/features/admin/procedure_creation_spec.rb
View file

@ -7,6 +7,9 @@ feature 'As an administrateur I wanna create a new procedure', js: true do
let(:administrateur) { create(:administrateur) }
before do
# FIXME: needed to make procedure_path validation work
create(:procedure)
Flipflop::FeatureSet.current.test!.switch!(:publish_draft, true)
login_as administrateur, scope: :administrateur
visit root_path
end
@ -29,21 +32,46 @@ feature 'As an administrateur I wanna create a new procedure', js: true do
end
context 'Creating a new procedure' do
scenario 'Finding save button for new procedure, libelle, description and cadre_juridique required' do
expect(page).to have_selector('#new-procedure')
find('#new-procedure').click
click_on 'from-scratch'
context "when publish_draft enabled" do
scenario 'Finding save button for new procedure, libelle, description and cadre_juridique required' do
expect(page).to have_selector('#new-procedure')
find('#new-procedure').click
click_on 'from-scratch'
expect(page).to have_current_path(new_admin_procedure_path)
fill_in 'procedure_duree_conservation_dossiers_dans_ds', with: '3'
fill_in 'procedure_duree_conservation_dossiers_hors_ds', with: '6'
click_on 'save-procedure'
expect(page).to have_current_path(new_admin_procedure_path)
fill_in 'procedure_duree_conservation_dossiers_dans_ds', with: '3'
fill_in 'procedure_duree_conservation_dossiers_hors_ds', with: '6'
click_on 'save-procedure'
expect(page).to have_text('Libelle doit être rempli')
fill_in_dummy_procedure_details
click_on 'save-procedure'
expect(page).to have_text('Libelle doit être rempli')
fill_in_dummy_procedure_details
click_on 'save-procedure'
expect(page).to have_current_path(admin_procedure_types_de_champ_path(Procedure.first))
expect(page).to have_current_path(admin_procedure_types_de_champ_path(Procedure.last))
end
end
context "when publish_draft disabled" do
before do
Flipflop::FeatureSet.current.test!.switch!(:publish_draft, false)
end
scenario 'Finding save button for new procedure, libelle, description and cadre_juridique required' do
expect(page).to have_selector('#new-procedure')
find('#new-procedure').click
click_on 'from-scratch'
expect(page).to have_current_path(new_admin_procedure_path)
fill_in 'procedure_duree_conservation_dossiers_dans_ds', with: '3'
fill_in 'procedure_duree_conservation_dossiers_hors_ds', with: '6'
click_on 'save-procedure'
expect(page).to have_text('Libelle doit être rempli')
fill_in_dummy_procedure_details(fill_path: false)
click_on 'save-procedure'
expect(page).to have_current_path(admin_procedure_types_de_champ_path(Procedure.last))
end
end
end
@ -64,20 +92,20 @@ feature 'As an administrateur I wanna create a new procedure', js: true do
scenario 'Add champ, add file, visualize them in procedure preview' do
fill_in 'procedure_types_de_champ_attributes_0_libelle', with: 'libelle de champ'
click_on 'add_type_de_champ'
expect(page).to have_current_path(admin_procedure_types_de_champ_path(Procedure.first))
expect(page).to have_current_path(admin_procedure_types_de_champ_path(Procedure.last))
expect(page).to have_selector('#procedure_types_de_champ_attributes_1_libelle')
expect(Procedure.first.types_de_champ.first.libelle).to eq('libelle de champ')
expect(Procedure.last.types_de_champ.first.libelle).to eq('libelle de champ')
click_on 'onglet-pieces'
expect(page).to have_current_path(admin_procedure_pieces_justificatives_path(Procedure.first))
expect(page).to have_current_path(admin_procedure_pieces_justificatives_path(Procedure.last))
fill_in 'procedure_types_de_piece_justificative_attributes_0_libelle', with: 'libelle de piece'
click_on 'add_piece_justificative'
expect(page).to have_current_path(admin_procedure_pieces_justificatives_path(Procedure.first))
expect(page).to have_current_path(admin_procedure_pieces_justificatives_path(Procedure.last))
expect(page).to have_selector('#procedure_types_de_piece_justificative_attributes_1_libelle')
preview_window = window_opened_by { click_on 'onglet-preview' }
within_window(preview_window) do
expect(page).to have_current_path(apercu_procedure_path(Procedure.first))
expect(page).to have_current_path(apercu_procedure_path(Procedure.last))
expect(page).to have_field('libelle de champ')
expect(page).to have_field('libelle de piece')
end
@ -88,28 +116,28 @@ feature 'As an administrateur I wanna create a new procedure', js: true do
click_on 'add_type_de_champ'
click_on 'onglet-pieces'
expect(page).to have_current_path(admin_procedure_pieces_justificatives_path(Procedure.first))
expect(page).to have_current_path(admin_procedure_pieces_justificatives_path(Procedure.last))
fill_in 'procedure_types_de_piece_justificative_attributes_0_libelle', with: 'libelle de piece'
click_on 'add_piece_justificative'
click_on 'onglet-infos'
expect(page).to have_current_path(admin_procedure_path(Procedure.first))
expect(page).to have_current_path(admin_procedure_path(Procedure.last))
expect(page).to have_selector('#disabled-publish-procedure')
expect(page.find_by_id('disabled-publish-procedure')[:disabled]).to eq('true')
click_on 'onglet-instructeurs'
expect(page).to have_current_path(admin_procedure_instructeurs_path(Procedure.first))
expect(page).to have_current_path(admin_procedure_instructeurs_path(Procedure.last))
fill_in 'gestionnaire_email', with: 'gestionnaire@apientreprise.fr'
click_on 'add-gestionnaire-email'
page.first('.gestionnaire-affectation').click
click_on 'onglet-infos'
expect(page).to have_current_path(admin_procedure_path(Procedure.first))
expect(page).to have_current_path(admin_procedure_path(Procedure.last))
expect(page).to have_selector('#publish-procedure', visible: true)
find('#publish-procedure').click
within '#publish-modal' do
expect(page).to have_field('procedure_path', with: 'libelle-de-la-procedure')
expect(page).to have_field('procedure_path', with: 'lien-de-la-procedure')
click_on 'publish'
end

7
spec/features/admin/procedure_spec_helper.rb
View file

@ -1,7 +1,10 @@
module ProcedureSpecHelper
def fill_in_dummy_procedure_details
def fill_in_dummy_procedure_details(fill_path: true)
fill_in 'procedure_libelle', with: 'libelle de la procedure'
page.execute_script("$('#procedure_description').val('description de la procedure')")
fill_in 'procedure_description', with: 'description de la procedure'
if fill_path
fill_in 'procedure_path', with: 'lien-de-la-procedure'
end
fill_in 'procedure_cadre_juridique', with: 'cadre juridique'
fill_in 'procedure_duree_conservation_dossiers_dans_ds', with: '3'
fill_in 'procedure_duree_conservation_dossiers_hors_ds', with: '6'

63
spec/features/admin/procedure_update_spec.rb Normal file
View file

@ -0,0 +1,63 @@
require 'spec_helper'
require 'features/admin/procedure_spec_helper'
feature 'Administrateurs can edit procedures', js: true do
include ProcedureSpecHelper
let(:administrateur) { create(:administrateur) }
let!(:procedure) do
create(:procedure_with_dossiers,
:published,
:with_path,
:with_type_de_champ,
administrateur: administrateur)
end
before do
Flipflop::FeatureSet.current.test!.switch!(:publish_draft, true)
login_as administrateur, scope: :administrateur
end
context 'when the procedure is in draft' do
let!(:procedure) do
create(:procedure_with_dossiers,
:with_path,
:with_type_de_champ,
administrateur: administrateur)
end
scenario 'the administrator can edit the libelle and the path' do
visit admin_procedures_draft_path
click_on procedure.libelle
click_on 'Description'
expect(page).to have_field('procedure_libelle', with: procedure.libelle)
expect(page).to have_field('procedure_path', with: procedure.path)
fill_in('procedure_libelle', with: 'Ma petite démarche')
fill_in('procedure_path', with: 'nouveau-lien-demarche')
click_on 'Enregistrer'
expect(page).to have_field('procedure_libelle', with: 'Ma petite démarche')
expect(page).to have_field('procedure_path', with: 'nouveau-lien-demarche')
end
end
context 'when the procedure is published' do
scenario 'the administrator can edit the libellé, but can‘t change the path' do
visit root_path
click_on procedure.libelle
click_on 'Description'
expect(page).to have_field('procedure_libelle', with: procedure.libelle)
expect(page).not_to have_field('procedure_path')
fill_in('procedure_libelle', with: 'Ma petite démarche')
click_on 'Enregistrer'
expect(page).to have_field('procedure_libelle', with: 'Ma petite démarche')
end
end
end