rend plus compréhensible la civilité

This commit is contained in:
Christophe Robillard 2020-12-08 17:43:50 +01:00
parent 30b9d603bd
commit 2066e3db87
8 changed files with 10 additions and 10 deletions

View file

@ -19,8 +19,8 @@ class Individual < ApplicationRecord
validates :nom, presence: true, allow_blank: false, allow_nil: false, on: :update validates :nom, presence: true, allow_blank: false, allow_nil: false, on: :update
validates :prenom, presence: true, allow_blank: false, allow_nil: false, on: :update validates :prenom, presence: true, allow_blank: false, allow_nil: false, on: :update
GENDER_MALE = 'M.' GENDER_MALE = 'Monsieur'
GENDER_FEMALE = 'Mme' GENDER_FEMALE = 'Madame'
def self.from_france_connect(fc_information) def self.from_france_connect(fc_information)
new( new(

View file

@ -57,7 +57,7 @@ FactoryBot.define do
factory :champ_civilite, class: 'Champs::CiviliteChamp' do factory :champ_civilite, class: 'Champs::CiviliteChamp' do
type_de_champ { association :type_de_champ_civilite, procedure: dossier.procedure } type_de_champ { association :type_de_champ_civilite, procedure: dossier.procedure }
value { 'M.' } value { 'Monsieur' }
end end
factory :champ_email, class: 'Champs::EmailChamp' do factory :champ_email, class: 'Champs::EmailChamp' do

View file

@ -1,6 +1,6 @@
FactoryBot.define do FactoryBot.define do
factory :individual do factory :individual do
gender { 'M.' } gender { 'Monsieur' }
nom { 'Julien' } nom { 'Julien' }
prenom { 'Xavier' } prenom { 'Xavier' }
birthdate { Date.new(1991, 11, 01) } birthdate { Date.new(1991, 11, 01) }

View file

@ -57,7 +57,7 @@ feature 'wcag rules for usager', js: true do
scenario "dépot d'un dossier" do scenario "dépot d'un dossier" do
click_on 'Commencer la démarche' click_on 'Commencer la démarche'
choose 'M.' choose 'Monsieur'
fill_in('individual_prenom', with: 'prenom') fill_in('individual_prenom', with: 'prenom')
fill_in('individual_nom', with: 'nom') fill_in('individual_nom', with: 'nom')
click_on 'Continuer' click_on 'Continuer'

View file

@ -185,7 +185,7 @@ feature 'The routing', js: true do
visit commencer_path(path: procedure.reload.path) visit commencer_path(path: procedure.reload.path)
click_on 'Commencer la démarche' click_on 'Commencer la démarche'
choose 'M.' choose 'Monsieur'
fill_in 'individual_nom', with: 'Nom' fill_in 'individual_nom', with: 'Nom'
fill_in 'individual_prenom', with: 'Prenom' fill_in 'individual_prenom', with: 'Prenom'
click_button('Continuer') click_button('Continuer')

View file

@ -51,7 +51,7 @@ feature 'The user' do
expect(champ_value_for('datetime')).to eq('06/01/2030 07:05') expect(champ_value_for('datetime')).to eq('06/01/2030 07:05')
expect(champ_value_for('number')).to eq('42') expect(champ_value_for('number')).to eq('42')
expect(champ_value_for('checkbox')).to eq('on') expect(champ_value_for('checkbox')).to eq('on')
expect(champ_value_for('civilite')).to eq('Mme') expect(champ_value_for('civilite')).to eq('Madame')
expect(champ_value_for('email')).to eq('loulou@yopmail.com') expect(champ_value_for('email')).to eq('loulou@yopmail.com')
expect(champ_value_for('phone')).to eq('0123456789') expect(champ_value_for('phone')).to eq('0123456789')
expect(champ_value_for('yes_no')).to eq('false') expect(champ_value_for('yes_no')).to eq('false')
@ -329,7 +329,7 @@ feature 'The user' do
end end
def fill_individual def fill_individual
choose 'M.' choose 'Monsieur'
fill_in('individual_prenom', with: 'prenom') fill_in('individual_prenom', with: 'prenom')
fill_in('individual_nom', with: 'nom') fill_in('individual_nom', with: 'nom')
click_on 'Continuer' click_on 'Continuer'

View file

@ -20,7 +20,7 @@ feature 'Creating a new dossier:' do
expect(page).to have_current_path identite_dossier_path(user.reload.dossiers.last) expect(page).to have_current_path identite_dossier_path(user.reload.dossiers.last)
expect(page).to have_procedure_description(procedure) expect(page).to have_procedure_description(procedure)
choose 'M.' choose 'Monsieur'
fill_in 'individual_nom', with: 'Nom' fill_in 'individual_nom', with: 'Nom'
fill_in 'individual_prenom', with: 'Prenom' fill_in 'individual_prenom', with: 'Prenom'
end end

View file

@ -57,7 +57,7 @@ feature 'linked dropdown lists' do
end end
def fill_individual def fill_individual
choose 'M.' choose 'Monsieur'
fill_in('individual_prenom', with: 'prenom') fill_in('individual_prenom', with: 'prenom')
fill_in('individual_nom', with: 'nom') fill_in('individual_nom', with: 'nom')
click_on 'Continuer' click_on 'Continuer'