Merge pull request #8305 from demarches-simplifiees/feature/prefill_civility

Allow prefill civility

app/models/champs/civilite_champ.rb

@@ -21,6 +21,8 @@
 #  type_de_champ_id               :integer
 #
 class Champs::CiviliteChamp < Champ
+  validates :value, inclusion: ["M.", "Mme"], allow_nil: true, allow_blank: false
+
   def html_label?
     false
   end

app/models/prefill_params.rb

@@ -33,7 +33,8 @@ class PrefillParams
   class PrefillValue
     NEED_VALIDATION_TYPES_DE_CHAMPS = [
       TypeDeChamp.type_champs.fetch(:decimal_number),
-      TypeDeChamp.type_champs.fetch(:integer_number)
+      TypeDeChamp.type_champs.fetch(:integer_number),
+      TypeDeChamp.type_champs.fetch(:civilite)
     ]
 
     attr_reader :champ, :value

app/models/type_de_champ.rb

@@ -259,7 +259,8 @@ class TypeDeChamp < ApplicationRecord
       TypeDeChamp.type_champs.fetch(:integer_number),
       TypeDeChamp.type_champs.fetch(:email),
       TypeDeChamp.type_champs.fetch(:phone),
-      TypeDeChamp.type_champs.fetch(:iban)
+      TypeDeChamp.type_champs.fetch(:iban),
+      TypeDeChamp.type_champs.fetch(:civilite)
     ])
   end
 

config/locales/fr.yml

@@ -107,6 +107,7 @@ fr:
           decimal_number: Un nombre décimal
           integer_number: Un nombre entier
           email: Une adresse email
+          civilite: '"M." pour Monsieur, "Mme" pour Madame'
           phone: Un numéro de téléphone
           iban: Un numéro Iban
           yes_no: '"true" pour Oui, "false" pour Non'
@@ -121,6 +122,7 @@ fr:
           phone: 0612345678
           iban: FR7611315000011234567890138
           yes_no: "true"
+          civilite: "M."
           checkbox: "on"
         prefill_link_title: Lien de préremplissage (GET)
         prefill_link_info: Copiez le lien grâce au bouton ci-dessous et remplacez les valeurs par les données dont vous disposez.

spec/factories/champ.rb

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

spec/models/prefill_params_spec.rb

@@ -89,6 +89,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is authorized", :type_de_champ_email, "value"
     it_behaves_like "a champ public value that is authorized", :type_de_champ_phone, "value"
     it_behaves_like "a champ public value that is authorized", :type_de_champ_iban, "value"
+    it_behaves_like "a champ public value that is authorized", :type_de_champ_civilite, "M."
 
     it_behaves_like "a champ public value that is unauthorized", :type_de_champ_decimal_number, "non decimal string"
     it_behaves_like "a champ public value that is unauthorized", :type_de_champ_integer_number, "non integer string"

spec/models/type_de_champ_spec.rb

@@ -242,13 +242,13 @@ describe TypeDeChamp do
     it_behaves_like "a prefillable type de champ", :type_de_champ_email
     it_behaves_like "a prefillable type de champ", :type_de_champ_phone
     it_behaves_like "a prefillable type de champ", :type_de_champ_iban
+    it_behaves_like "a prefillable type de champ", :type_de_champ_civilite
 
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_number
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_communes
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_dossier_link
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_checkbox
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_titre_identite
-    it_behaves_like "a non-prefillable type de champ", :type_de_champ_civilite
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_yes_no
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_date
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_datetime