diff --git a/app/models/individual.rb b/app/models/individual.rb index 958635198..a5376427f 100644 --- a/app/models/individual.rb +++ b/app/models/individual.rb @@ -19,8 +19,8 @@ class Individual < ApplicationRecord validates :nom, 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_FEMALE = 'Mme' + GENDER_MALE = 'Monsieur' + GENDER_FEMALE = 'Madame' def self.from_france_connect(fc_information) new( diff --git a/spec/factories/champ.rb b/spec/factories/champ.rb index dd7ca6e27..9d55df1bb 100644 --- a/spec/factories/champ.rb +++ b/spec/factories/champ.rb @@ -57,7 +57,7 @@ FactoryBot.define do factory :champ_civilite, class: 'Champs::CiviliteChamp' do type_de_champ { association :type_de_champ_civilite, procedure: dossier.procedure } - value { 'M.' } + value { 'Monsieur' } end factory :champ_email, class: 'Champs::EmailChamp' do diff --git a/spec/factories/individual.rb b/spec/factories/individual.rb index e93b3f6c0..d4d77bcd1 100644 --- a/spec/factories/individual.rb +++ b/spec/factories/individual.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :individual do - gender { 'M.' } + gender { 'Monsieur' } nom { 'Julien' } prenom { 'Xavier' } birthdate { Date.new(1991, 11, 01) } diff --git a/spec/features/accessibilite/wcag_usager_spec.rb b/spec/features/accessibilite/wcag_usager_spec.rb index 056987182..a7fc63f20 100644 --- a/spec/features/accessibilite/wcag_usager_spec.rb +++ b/spec/features/accessibilite/wcag_usager_spec.rb @@ -57,7 +57,7 @@ feature 'wcag rules for usager', js: true do scenario "dépot d'un dossier" do click_on 'Commencer la démarche' - choose 'M.' + choose 'Monsieur' fill_in('individual_prenom', with: 'prenom') fill_in('individual_nom', with: 'nom') click_on 'Continuer' diff --git a/spec/features/routing/full_scenario_spec.rb b/spec/features/routing/full_scenario_spec.rb index 0609a22c0..ba9a5607a 100644 --- a/spec/features/routing/full_scenario_spec.rb +++ b/spec/features/routing/full_scenario_spec.rb @@ -185,7 +185,7 @@ feature 'The routing', js: true do visit commencer_path(path: procedure.reload.path) click_on 'Commencer la démarche' - choose 'M.' + choose 'Monsieur' fill_in 'individual_nom', with: 'Nom' fill_in 'individual_prenom', with: 'Prenom' click_button('Continuer') diff --git a/spec/features/users/brouillon_spec.rb b/spec/features/users/brouillon_spec.rb index 39d170fbc..94e89dc0a 100644 --- a/spec/features/users/brouillon_spec.rb +++ b/spec/features/users/brouillon_spec.rb @@ -51,7 +51,7 @@ feature 'The user' do expect(champ_value_for('datetime')).to eq('06/01/2030 07:05') expect(champ_value_for('number')).to eq('42') 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('phone')).to eq('0123456789') expect(champ_value_for('yes_no')).to eq('false') @@ -329,7 +329,7 @@ feature 'The user' do end def fill_individual - choose 'M.' + choose 'Monsieur' fill_in('individual_prenom', with: 'prenom') fill_in('individual_nom', with: 'nom') click_on 'Continuer' diff --git a/spec/features/users/dossier_creation_spec.rb b/spec/features/users/dossier_creation_spec.rb index 91a9c971c..2972d4213 100644 --- a/spec/features/users/dossier_creation_spec.rb +++ b/spec/features/users/dossier_creation_spec.rb @@ -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_procedure_description(procedure) - choose 'M.' + choose 'Monsieur' fill_in 'individual_nom', with: 'Nom' fill_in 'individual_prenom', with: 'Prenom' end diff --git a/spec/features/users/linked_dropdown_spec.rb b/spec/features/users/linked_dropdown_spec.rb index 3ba3c45cd..ff4524b64 100644 --- a/spec/features/users/linked_dropdown_spec.rb +++ b/spec/features/users/linked_dropdown_spec.rb @@ -57,7 +57,7 @@ feature 'linked dropdown lists' do end def fill_individual - choose 'M.' + choose 'Monsieur' fill_in('individual_prenom', with: 'prenom') fill_in('individual_nom', with: 'nom') click_on 'Continuer'