fix specs

Author: microstudi

app/views/decidim/extra_user_fields/_registration_form.html.erb

@@ -3,7 +3,7 @@
     <h2 class="h4"><%= t(".signup.legend") %></h2>
 
     <% if current_organization.activated_extra_field?(:date_of_birth) %>
-      <div><%= f.date_field :date_of_birth, id: "user_date_of_birth" %></div>
+      <div><%= f.date_field :date_of_birth %></div>
     <% end %>
 
     <% if current_organization.activated_extra_field?(:gender) %>

app/views/decidim/extra_user_fields/_select_fields.html.erb

@@ -1,14 +1,14 @@
     <% f.object.custom_select_fields_options.each do |field, options| %>
       <div class="fieldset">
-        <%= label_tag "user_select_fields_#{field}" do %>
+        <%= label_tag f.field_id("select_fields_#{field}") do %>
           <%= t("decidim.extra_user_fields.select_fields.#{field}.label", default: field.to_s.humanize) %>
           <% if (help = t("decidim.extra_user_fields.select_fields.#{field}.description", default: "")).present? %>
             <span class="help-text"><%= help %></span>
           <% end %>
 
           <%= select_tag "user[select_fields][#{field}]",
                         options_for_select(options, f.object.select_fields[field]),
-                        id: "user_select_fields_#{field}" %>
+                        id: f.field_id("select_fields_#{field}") %>
         <% end %>
       </div>
     <% end %>

config/locales/fr.yml

@@ -85,11 +85,20 @@ fr:
             extra_user_fields:
               extra_user_fields_enabled: Activer les champs d'inscription personnalisés
               section: Champs d'inscription disponibles pour le formulaire d'inscription
+              section_extras: Champs supplémentaires personnalisés
+              section_extras_description: Si vous avez configuré des champs d'utilisateur
+                supplémentaires, vous pouvez les gérer ici (Voir la section "Configuration
+                via un initializer" dans le README du plugin).
             global:
               title: Activer / Désactiver les champs d'inscription personnalisés
           index:
             save: Sauvegarder
             title: Gérer les champs d'inscription personnalisés
+          select_fields:
+            participant_type:
+              description: Ce champ est une liste de types de participants. L'utilisateur
+                devra choisir un type de participant.
+              label: Activer le champ type de participant
           update:
             failure: Une erreur est survenue lors de la mise à jour
             success: Les champs d'inscription ont été mis à jour avec succ§s
@@ -99,6 +108,8 @@ fr:
         61_or_more: 61 ou plus
         prefer_not_to_say: Préfère ne pas dire
         up_to_16: 16 ou moins
+      errors:
+        select_fields: Le champ "%{field}" n'est pas valide.
       genders:
         female: Femme
         male: Homme
@@ -109,6 +120,9 @@ fr:
           legend: Plus d'information
           underage: Je suis âgé de moins de %{limit} ans et j'accepte d'obtenir une
             autorisation parentale
+      select_fields:
+        participant_type:
+          label: Activer le champ type de participant
     statutory_representative:
       inform:
         body: |

lib/decidim/extra_user_fields.rb

@@ -46,7 +46,7 @@ module ExtraUserFields
     config_accessor :select_fields do
       {
         participant_type: {
-          "" => "",
+          # "" => "",
           "individual" => "decidim.extra_user_fields.participant_types.individual",
           "organization" => "decidim.extra_user_fields.participant_types.organization"
         }

spec/system/account_spec.rb

@@ -108,7 +108,7 @@
           fill_in :user_personal_url, with: "https://example.org"
           fill_in :user_about, with: "A Serbian-American inventor, electrical engineer, mechanical engineer, physicist, and futurist."
 
-          fill_in :user_date_of_birth_date, with: "01/01/2000"
+          fill_in_datepicker :user_date_of_birth_date, with: "01/01/2000"
           select "Other", from: :user_gender
           select "17 to 30", from: :user_age_range
           select "Argentina", from: :user_country
@@ -256,7 +256,7 @@
           fill_in :user_personal_url, with: "https://example.org"
           fill_in :user_about, with: "A Serbian-American inventor, electrical engineer, mechanical engineer, physicist, and futurist."
 
-          fill_in :user_date_of_birth_date, with: "01/01/2000"
+          fill_in_datepicker :user_date_of_birth_date, with: "01/01/2000"
           select "Other", from: :user_gender
           select "17 to 30", from: :user_age_range
           select "Argentina", from: :user_country
@@ -318,7 +318,7 @@
           fill_in :user_personal_url, with: "https://example.org"
           fill_in :user_about, with: "A Serbian-American inventor, electrical engineer, mechanical engineer, physicist, and futurist."
 
-          fill_in :user_date_of_birth_date, with: "01/01/2000"
+          fill_in_datepicker :user_date_of_birth_date, with: "01/01/2000"
           select "Other", from: :user_gender
           select "17 to 30", from: :user_age_range
           select "Argentina", from: :user_country

spec/system/registration_spec.rb

@@ -11,11 +11,11 @@ def fill_registration_form
 end
 
 def fill_extra_user_fields
-  fill_in :registration_user_date_of_birth_date, with: "01/01/2000"
+  fill_in_datepicker :registration_user_date_of_birth_date, with: "01/01/2000"
   select "Other", from: :registration_user_gender
   select "17 to 30", from: :registration_user_age_range
   select "Argentina", from: :registration_user_country
-  select "Individual", from: :registration_user_participant_type
+  select "Individual", from: :registration_user_select_fields_participant_type
   fill_in :registration_user_postal_code, with: "00000"
   fill_in :registration_user_phone_number, with: "0123456789"
   fill_in :registration_user_location, with: "Cahors"
@@ -97,8 +97,7 @@ def fill_extra_user_fields
       expect(page).to have_content("Phone Number")
       expect(page).to have_content("Location")
       expect(page).to have_content("How old are you?")
-      expect(page).to have_content("How do you identify?")
-      expect(page).to have_content("Select your participant type")
+      expect(page).to have_content("Are you participating as an individual, or officially on behalf of an organization?")
     end
   end
 
@@ -165,8 +164,8 @@ def fill_extra_user_fields
       expect(page).to have_no_content("Postal code")
       expect(page).to have_no_content("Phone Number")
       expect(page).to have_no_content("Location")
-      expect(page).to have_no_content("How do you identify?")
-      expect(page).to have_no_content("Select your participant type")
+      expect(page).to have_no_content("Which gender do you identify with?")
+      expect(page).to have_no_content("Are you participating as an individual, or officially on behalf of an organization?")
     end
 
     it "allows to create a new account" do