+
<%= extra_user_fields_export_users_dropdown %>
diff --git a/app/views/decidim/extra_user_fields/admin/extra_user_fields/_form.html.erb b/app/views/decidim/extra_user_fields/admin/extra_user_fields/_form.html.erb
index dc61bb0..a5a6965 100644
--- a/app/views/decidim/extra_user_fields/admin/extra_user_fields/_form.html.erb
+++ b/app/views/decidim/extra_user_fields/admin/extra_user_fields/_form.html.erb
@@ -1,7 +1,7 @@
<%= cell("decidim/announcement", t(".callout.help")) %>
-
+
-
false } }
+ #
+ # # NOTE: We skip running the accessibility test when `date_of_birth` is enabled
+ # # because the custom Decidim datepicker JavaScript removes accessibility attributes
+ # # like `title`, `aria-label`, and causes Axe validation errors.
+ # #
+ # # This test runs only when `date_of_birth` is disabled to avoid false negatives.
+ #
+ # it_behaves_like "accessible page"
+ # end
describe "updating personal data" do
let!(:encrypted_password) { user.encrypted_password }
+ let(:motto) { "I think, therefore I am." }
before do
within "form.edit_user" do
@@ -92,9 +126,13 @@
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, 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
+ select "Individual", from: :user_select_fields_participant_type
+ check "I am a member of a non-governmental organization (NGO)"
+ fill_in :user_text_fields_motto, with: motto
fill_in :user_postal_code, with: "00000"
fill_in :user_phone_number, with: "0123456789"
fill_in :user_location, with: "Cahors"
@@ -107,6 +145,10 @@
expect(page).to have_content("successfully")
end
+ expect(page).to have_field(with: "Nikola Tesla")
+ expect(page).to have_field(with: "I think, therefore I am.")
+ expect(page).to have_select(selected: "Individual")
+
user.reload
within_user_menu do
@@ -115,6 +157,8 @@
expect(page).to have_content("example.org")
expect(page).to have_content("Serbian-American")
+ expect(page).to have_content("Nikola Tesla")
+ expect(page).to have_content("A Serbian-American inventor, electrical engineer, mechanical engineer, physicist, and futurist.")
# The user's password should not change when they did not update it
expect(user.reload.encrypted_password).to eq(encrypted_password)
@@ -132,7 +176,7 @@
end
it "shows error when image is too big" do
- find("#user_avatar_button").click
+ find_by_id("user_avatar_button").click
within ".upload-modal" do
click_on "Remove"
@@ -164,6 +208,41 @@
end
end
end
+
+ context "with text field blank" do
+ let(:motto) { "" }
+
+ it "does not update the user's data" do
+ within_flash_messages do
+ expect(page).to have_content("successfully")
+ end
+
+ expect(page).to have_field(with: "Nikola Tesla")
+ expect(page).to have_no_field(with: "I think, therefore I am.")
+ expect(page).to have_select(selected: "Individual")
+ end
+
+ context "with text field mandatory" do
+ let(:enabled_text_fields) do
+ {
+ motto: true
+ }
+ end
+
+ it "displays the field as mandatory" do
+ within "label[for='user_text_fields_motto']" do
+ expect(page).to have_css("span.label-required")
+ end
+ within "form.edit_user" do
+ fill_in :user_text_fields_motto, with: ""
+ find("*[type=submit]").click
+ end
+ within "label[for='user_text_fields_motto']" do
+ expect(page).to have_content("There is an error in this field.")
+ end
+ end
+ end
+ end
end
context "when date_of_birth is not enabled" do
@@ -198,6 +277,14 @@
it_behaves_like "does not display extra user field", "gender", "Gender"
end
+ context "when age_range is not enabled" do
+ let(:age_range) do
+ { "enabled" => false }
+ end
+
+ it_behaves_like "does not display extra user field", "age_range", "Age range"
+ end
+
context "when phone number is not enabled" do
let(:phone_number) do
{ "enabled" => false }
@@ -214,6 +301,30 @@
it_behaves_like "does not display extra user field", "location", "Location"
end
+ context "when select_fields is not enabled" do
+ let(:select_fields) do
+ ["another_field"]
+ end
+
+ it_behaves_like "does not display extra user field", "select_fields", "Select fields"
+ end
+
+ context "when boolean_fields is not enabled" do
+ let(:boolean_fields) do
+ ["another_field"]
+ end
+
+ it_behaves_like "does not display extra user field", "boolean_fields", "Boolean fields"
+ end
+
+ context "when text_fields is not enabled" do
+ let(:text_fields) do
+ ["another_field"]
+ end
+
+ it_behaves_like "does not display extra user field", "text_fields", "Text fields"
+ end
+
describe "when update password" do
before do
within "form.edit_user" do
@@ -222,9 +333,13 @@
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, 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
+ select "Individual", from: :user_select_fields_participant_type
+ check "I am a member of a non-governmental organization (NGO)"
+ fill_in :user_text_fields_motto, with: "I think, therefore I am."
fill_in :user_postal_code, with: "00000"
fill_in :user_phone_number, with: "0123456789"
fill_in :user_location, with: "Cahors"
@@ -282,9 +397,13 @@
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, 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
+ select "Individual", from: :user_select_fields_participant_type
+ check "I am a member of a non-governmental organization (NGO)"
+ fill_in :user_text_fields_motto, with: "I think, therefore I am."
fill_in :user_postal_code, with: "00000"
fill_in :user_phone_number, with: "0123456789"
fill_in :user_location, with: "Cahors"
@@ -302,7 +421,7 @@
it "toggles the current password" do
expect(page).to have_content("In order to confirm the changes to your account, please provide your current password.")
- expect(find("#user_old_password")).to be_visible
+ expect(find_by_id("user_old_password")).to be_visible
expect(page).to have_content "Current password"
expect(page).to have_no_content "Password"
end
@@ -415,44 +534,6 @@
end
end
- context "when on the interests page" do
- before do
- visit decidim.user_interests_path
- end
-
- it "does not find any scopes" do
- expect(page).to have_content("My interests")
- expect(page).to have_content("This organization does not have any scope yet")
- end
-
- context "when scopes are defined" do
- let!(:scopes) { create_list(:scope, 3, organization:) }
- let!(:subscopes) { create_list(:subscope, 3, parent: scopes.first) }
-
- before do
- visit decidim.user_interests_path
- end
-
- it "display translated scope name" do
- expect(page).to have_content("My interests")
- within "label[for='user_scopes_#{scopes.first.id}_checked']" do
- expect(page).to have_content(translated(scopes.first.name))
- end
- end
-
- it "allows to choose interests" do
- label_field = "label[for='user_scopes_#{scopes.first.id}_checked']"
- expect(page).to have_content("My interests")
- find(label_field).click
- click_on "Update my interests"
-
- within_flash_messages do
- expect(page).to have_content("Your interests have been successfully updated.")
- end
- end
- end
- end
-
context "when on the delete my account page" do
before do
visit decidim.delete_account_path
@@ -463,9 +544,8 @@
end
it "the user can delete their account" do
- fill_in :delete_user_delete_account_delete_reason, with: "I just want to delete my account"
-
- within ".form__wrapper-block" do
+ within ".delete-account" do
+ fill_in :delete_user_delete_account_delete_reason, with: "I just want to delete my account"
click_on "Delete my account"
end
@@ -513,7 +593,8 @@
context "when VAPID keys are set" do
before do
- Rails.application.secrets[:vapid] = vapid_keys
+ allow(Decidim).to receive(:vapid_public_key).and_return(vapid_keys[:public_key])
+ allow(Decidim).to receive(:vapid_private_key).and_return(vapid_keys[:private_key])
driven_by(:pwa_chrome)
switch_to_host(organization.host)
login_as user, scope: :user
@@ -536,28 +617,15 @@
expect(page).to have_content("successfully")
end
- find(:css, "#allow_push_notifications", visible: false).execute_script("this.checked = true")
+ find_by_id("allow_push_notifications", visible: false).execute_script("this.checked = true")
end
end
end
- context "when VAPID is disabled" do
- before do
- Rails.application.secrets[:vapid] = { enabled: false }
- driven_by(:pwa_chrome)
- switch_to_host(organization.host)
- login_as user, scope: :user
- visit decidim.notifications_settings_path
- end
-
- it "does not show the push notifications switch" do
- expect(page).to have_no_selector(".push-notifications")
- end
- end
-
context "when VAPID keys are not set" do
before do
- Rails.application.secrets.delete(:vapid)
+ allow(Decidim).to receive(:vapid_public_key).and_return(nil)
+ allow(Decidim).to receive(:vapid_private_key).and_return(nil)
driven_by(:pwa_chrome)
switch_to_host(organization.host)
login_as user, scope: :user
diff --git a/spec/system/admin_manages_officializations_spec.rb b/spec/system/admin_manages_officializations_spec.rb
index 93a1b69..815ef71 100644
--- a/spec/system/admin_manages_officializations_spec.rb
+++ b/spec/system/admin_manages_officializations_spec.rb
@@ -2,7 +2,7 @@
require "spec_helper"
-describe "Admin manages officializations" do
+describe "Admin manages officializations" do # rubocop:disable RSpec/DescribeClass
include_context "with filterable context"
let(:model_name) { Decidim::User.model_name }
diff --git a/spec/system/admin_manages_organization_extra_user_fields_spec.rb b/spec/system/admin_manages_organization_extra_user_fields_spec.rb
index 1c46fec..87d4cf6 100644
--- a/spec/system/admin_manages_organization_extra_user_fields_spec.rb
+++ b/spec/system/admin_manages_organization_extra_user_fields_spec.rb
@@ -2,7 +2,7 @@
require "spec_helper"
-describe "Admin manages organization extra user fields" do
+describe "Admin manages organization extra user fields" do # rubocop:disable RSpec/DescribeClass
let(:organization) { create(:organization) }
let(:user) { create(:user, :admin, :confirmed, organization:) }
@@ -46,5 +46,112 @@
expect(page).to have_content("Extra user fields correctly updated in organization")
end
end
+
+ context "when custom select_fields" do
+ it "displays the custom select fields" do
+ within "#accordion-setup" do
+ expect(page).to have_content("Additional custom fields")
+ expect(page).to have_content("Enable participant type")
+ expect(page).to have_content("This field is a list of participant types")
+
+ page.check("Enable participant type field")
+ end
+
+ find("*[type=submit]", text: "Save configuration").click
+ expect(page).to have_content("Extra user fields correctly updated in organization")
+ end
+ end
+
+ context "when custom boolean_fields" do
+ it "displays the custom boolean fields" do
+ within "#accordion-setup" do
+ expect(page).to have_content("Additional custom fields")
+ expect(page).to have_content("Enable NGO field")
+ expect(page).to have_content("This field is a Boolean field. User will be able to check if is a NGO")
+
+ page.check("Enable NGO field")
+ end
+
+ find("*[type=submit]", text: "Save configuration").click
+ expect(page).to have_content("Extra user fields correctly updated in organization")
+ end
+ end
+
+ context "when custom text_fields" do
+ it "displays the custom text fields" do
+ within "#accordion-setup" do
+ expect(page).to have_content("Additional custom fields")
+ expect(page).to have_content("Enable \"My Motto\" field")
+ expect(page).to have_content("This field is a String field. If checked, user can fill in a personal phrase or motto")
+
+ page.check("Enable \"My Motto\" field")
+ end
+
+ find("*[type=submit]", text: "Save configuration").click
+ expect(page).to have_content("Extra user fields correctly updated in organization")
+ end
+ end
+ end
+
+ context "and no translations are provided" do
+ let(:custom_select_fields) do
+ {
+ animal_type: {
+ dog: "I love dogs",
+ cat: "I love cats"
+ }
+ }
+ end
+ let(:custom_boolean_fields) do
+ [:dog_person]
+ end
+ let(:custom_text_fields) do
+ {
+ pet_name: false
+ }
+ end
+
+ before do
+ allow(Decidim::ExtraUserFields).to receive(:select_fields).and_return(custom_select_fields)
+ allow(Decidim::ExtraUserFields).to receive(:boolean_fields).and_return(custom_boolean_fields)
+ allow(Decidim::ExtraUserFields).to receive(:text_fields).and_return(custom_text_fields)
+ visit decidim_extra_user_fields.root_path
+ end
+
+ it "displays the custom select fields" do
+ within "#accordion-setup" do
+ expect(page).to have_content("Additional custom fields")
+ expect(page).to have_content("Animal type")
+
+ page.check("Animal type")
+ end
+
+ find("*[type=submit]", text: "Save configuration").click
+ expect(page).to have_content("Extra user fields correctly updated in organization")
+ end
+
+ it "displays the custom boolean fields" do
+ within "#accordion-setup" do
+ expect(page).to have_content("Additional custom fields")
+ expect(page).to have_content("Dog person")
+
+ page.check("Dog person")
+ end
+
+ find("*[type=submit]", text: "Save configuration").click
+ expect(page).to have_content("Extra user fields correctly updated in organization")
+ end
+
+ it "displays the custom text fields" do
+ within "#accordion-setup" do
+ expect(page).to have_content("Additional custom fields")
+ expect(page).to have_content("Pet name")
+
+ page.check("Pet name")
+ end
+
+ find("*[type=submit]", text: "Save configuration").click
+ expect(page).to have_content("Extra user fields correctly updated in organization")
+ end
end
end
diff --git a/spec/system/registration_spec.rb b/spec/system/registration_spec.rb
index 9250b93..81e8c3b 100644
--- a/spec/system/registration_spec.rb
+++ b/spec/system/registration_spec.rb
@@ -11,18 +11,19 @@ def fill_registration_form
end
def fill_extra_user_fields
- fill_in :registration_user_date_of_birth, 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_select_fields_participant_type
+ check "registration_user_boolean_fields_ngo"
+ fill_in :registration_registration_user_text_fields_motto, with: "I think, therefore I am."
fill_in :registration_user_postal_code, with: "00000"
fill_in :registration_user_phone_number, with: "0123456789"
fill_in :registration_user_location, with: "Cahors"
- # Block ExtraUserFields FillExtraUserFields
-
- # EndBlock
end
-describe "Extra user fields" do
+describe "Extra user fields" do # rubocop:disable RSpec/DescribeClass
shared_examples_for "mandatory extra user fields" do |field|
it "displays #{field} as mandatory" do
within "label[for='registration_user_#{field}']" do
@@ -33,21 +34,22 @@ def fill_extra_user_fields
let(:organization) { create(:organization, extra_user_fields:) }
let!(:terms_and_conditions_page) { Decidim::StaticPage.find_by(slug: "terms-and-conditions", organization:) }
- # rubocop:disable Style/TrailingCommaInHashLiteral
+
let(:extra_user_fields) do
{
- # Block ExtraUserFields ExtraUserFields
"enabled" => true,
"date_of_birth" => date_of_birth,
"postal_code" => postal_code,
"gender" => gender,
+ "age_range" => age_range,
"country" => country,
"phone_number" => phone_number,
"location" => location,
- # EndBlock
+ "select_fields" => select_fields,
+ "boolean_fields" => boolean_fields,
+ "text_fields" => text_fields
}
end
- # rubocop:enable Style/TrailingCommaInHashLiteral
let(:date_of_birth) do
{ "enabled" => true }
@@ -65,6 +67,10 @@ def fill_extra_user_fields
{ "enabled" => true }
end
+ let(:age_range) do
+ { "enabled" => true }
+ end
+
let(:phone_number) do
{ "enabled" => true, "pattern" => phone_number_pattern, "placeholder" => nil }
end
@@ -74,9 +80,17 @@ def fill_extra_user_fields
{ "enabled" => true }
end
- # Block ExtraUserFields RspecVar
+ let(:select_fields) do
+ ["participant_type"]
+ end
- # EndBlock
+ let(:boolean_fields) do
+ ["ngo"]
+ end
+
+ let(:text_fields) do
+ ["motto"]
+ end
before do
switch_to_host(organization.host)
@@ -86,14 +100,15 @@ def fill_extra_user_fields
it "contains extra user fields" do
within "#card__extra_user_fields" do
expect(page).to have_content("Date of birth")
- expect(page).to have_content("Gender")
+ expect(page).to have_content("Which gender do you identify with?")
expect(page).to have_content("Country")
expect(page).to have_content("Postal code")
expect(page).to have_content("Phone Number")
expect(page).to have_content("Location")
- # Block ExtraUserFields ContainsFieldSpec
-
- # EndBlock
+ expect(page).to have_content("How old are you?")
+ expect(page).to have_content("Are you participating as an individual, or officially on behalf of an organization?")
+ expect(page).to have_content("I am a member of a non-governmental organization (NGO)")
+ expect(page).to have_content("What is your motto?")
end
end
@@ -106,6 +121,18 @@ def fill_extra_user_fields
end
expect(page).to have_content("message with a confirmation link has been sent")
+
+ extended_data = Decidim::User.unscoped.last.extended_data
+ expect(extended_data["text_fields"]["motto"]).to eq("I think, therefore I am.")
+ expect(extended_data["boolean_fields"]).to eq(["ngo"])
+ expect(extended_data["select_fields"]["participant_type"]).to eq("individual")
+ expect(extended_data["date_of_birth"]).to eq("2000-01-01")
+ expect(extended_data["gender"]).to eq("other")
+ expect(extended_data["age_range"]).to eq("17_to_30")
+ expect(extended_data["country"]).to eq("AR")
+ expect(extended_data["postal_code"]).to eq("00000")
+ expect(extended_data["phone_number"]).to eq("0123456789")
+ expect(extended_data["location"]).to eq("Cahors")
end
context "with phone number pattern blank" do
@@ -143,27 +170,26 @@ def fill_extra_user_fields
it_behaves_like "mandatory extra user fields", "date_of_birth"
it_behaves_like "mandatory extra user fields", "gender"
+ it_behaves_like "mandatory extra user fields", "age_range"
it_behaves_like "mandatory extra user fields", "country"
it_behaves_like "mandatory extra user fields", "postal_code"
it_behaves_like "mandatory extra user fields", "phone_number"
it_behaves_like "mandatory extra user fields", "location"
- # Block ExtraUserFields ItBehavesLikeSpec
-
- # EndBlock
context "when extra_user_fields is disabled" do
let(:organization) { create(:organization, :extra_user_fields_disabled) }
it "does not contain extra user fields" do
expect(page).to have_no_content("Date of birth")
- expect(page).to have_no_content("Gender")
+ expect(page).to have_no_content("Which gender do you identify with?")
+ expect(page).to have_no_content("How old are you?")
expect(page).to have_no_content("Country")
expect(page).to have_no_content("Postal code")
expect(page).to have_no_content("Phone Number")
expect(page).to have_no_content("Location")
- # Block ExtraUserFields DoesNotContainFieldSpec
-
- # EndBlock
+ 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?")
+ expect(page).to have_no_content("I am a member of a non-governmental organization (NGO)")
end
it "allows to create a new account" do
>
+
diff --git a/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_age_range.html.erb b/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_age_range.html.erb
new file mode 100644
index 0000000..59ecb9b
--- /dev/null
+++ b/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_age_range.html.erb
@@ -0,0 +1,5 @@
+>
+
diff --git a/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_boolean_fields.html.erb b/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_boolean_fields.html.erb
new file mode 100644
index 0000000..f3713f6
--- /dev/null
+++ b/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_boolean_fields.html.erb
@@ -0,0 +1,15 @@
+<% custom_boolean_fields(form).each do |field, checked| %>
+
+ <%= form.check_box :age_range, label: t(".label"), help_text: t(".description") %>
+
+
+
+<% end %>
diff --git a/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_phone_number.html.erb b/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_phone_number.html.erb
index d8a053e..c818ee3 100644
--- a/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_phone_number.html.erb
+++ b/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_phone_number.html.erb
@@ -1,6 +1,6 @@
+ <%= label_tag "extra_user_fields_select_field_#{field}" do %>
+
+ <%= check_box_tag "extra_user_fields[boolean_fields][]",
+ field,
+ checked,
+ id: "extra_user_fields_select_field_#{field}" %>
+ <%= t("decidim.extra_user_fields.admin.extra_user_fields.boolean_fields.#{field}.label", default: field.to_s.humanize ) %>
+ <%= t("decidim.extra_user_fields.admin.extra_user_fields.boolean_fields.#{field}.description", default: "") %>
+ <% end %>
+
+
- <%= form.check_box :phone_number, label: t(".label"), help_text: t(".description"), data: { toggle: "phone_fields" } %>
+ <%= form.check_box :phone_number, label: t(".label"), help_text: t(".description"), data: { controller: "toggle", toggle_target: "phone_fields" } %>
>
<%= form.text_field :phone_number_pattern, help_text: t(".pattern_help_html"), label: t(".pattern"), placeholder: "^(\\+34|0034|34)?[ -]*[6-9][ -]*([0-9][ -]*){8}$", data: { type: :phone_number } %>
diff --git a/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_select_fields.html.erb b/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_select_fields.html.erb
new file mode 100644
index 0000000..f648e7e
--- /dev/null
+++ b/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_select_fields.html.erb
@@ -0,0 +1,15 @@
+<% custom_select_fields(form).each do |field, checked| %>
+
diff --git a/bin/dev b/bin/dev
new file mode 100755
index 0000000..e009f8d
--- /dev/null
+++ b/bin/dev
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+cd development_app
+
+./bin/dev
diff --git a/bin/rails b/bin/rails
index a721644..961aa72 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,16 +1,6 @@
#!/usr/bin/env ruby
# frozen_string_literal: true
-# This command will automatically be run when you run "rails" with Rails gems
-# installed from the root of your application.
+Dir.chdir("development_app")
-ENGINE_ROOT = File.expand_path("..", __dir__)
-ENGINE_PATH = File.expand_path("../lib/decidim/extra_user_fields/engine", __dir__)
-
-# Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
-
-require "bundler/setup"
-
-require "rails/all"
-require "rails/engine/commands"
+load "bin/rails"
diff --git a/bin/shakapacker b/bin/shakapacker
new file mode 100755
index 0000000..86aefe8
--- /dev/null
+++ b/bin/shakapacker
@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+Dir.chdir("development_app")
+
+load "bin/shakapacker"
diff --git a/bin/shakapacker-dev-server b/bin/shakapacker-dev-server
new file mode 100755
index 0000000..0226ffe
--- /dev/null
+++ b/bin/shakapacker-dev-server
@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+Dir.chdir("development_app")
+
+load "bin/shakapacker-dev-server"
diff --git a/config/assets.rb b/config/assets.rb
index 9be6ca7..f3f06f2 100644
--- a/config/assets.rb
+++ b/config/assets.rb
@@ -12,13 +12,13 @@
# in your JavaScript entrypoints (or other JavaScript files within Decidim)
# using `import "src/decidim/foo"` after you have registered the additional path
# as follows.
-Decidim::Webpacker.register_path("#{base_path}/app/packs")
+Decidim::Shakapacker.register_path("#{base_path}/app/packs")
# Register the entrypoints for your module. These entrypoints can be included
# within your application using `javascript_pack_tag` and if you include any
# SCSS files within the entrypoints, they become available for inclusion using
# `stylesheet_pack_tag`.
-Decidim::Webpacker.register_entrypoints(
+Decidim::Shakapacker.register_entrypoints(
decidim_extra_user_fields: "#{base_path}/app/packs/entrypoints/decidim_extra_user_fields.js",
decidim_extra_user_fields_css: "#{base_path}/app/packs/entrypoints/decidim_extra_user_fields.scss"
)
@@ -26,4 +26,4 @@
# If you want to import some extra SCSS files in the Decidim main SCSS file
# without adding any extra stylesheet inclusion tags, you can use the following
# method to register the stylesheet import for the main application.
-# Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/homepage_interactive_map/map.scss")
+# Decidim::Shakapacker.register_stylesheet_import("stylesheets/decidim/homepage_interactive_map/map.scss")
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index aa01e24..d31a358 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -9,6 +9,7 @@ ignore_unused:
- activemodel.errors.models.user.*
- decidim.admin.extra_user_fields.menu.title
- decidim.extra_user_fields.genders.*
+ - decidim.extra_user_fields.age_ranges.*
ignore_missing:
- decidim.participatory_processes.scopes.global
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 3e2a517..3686b2c 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -3,9 +3,10 @@ ca:
activemodel:
attributes:
user:
+ age_range: Quina edat tens?
country: País
date_of_birth: Data de naixement
- gender: Gènere
+ gender: Quin gènere identifiques?
location: Localització
phone_number: Telèfon
postal_code: Codi postal
@@ -36,6 +37,10 @@ ca:
users: Participants
extra_user_fields:
fields:
+ age_range:
+ description: Aquest camp és una llista de rangs d'edat. Si está activat,
+ l'usuari haurà de triar un rang d'edat.
+ label: Habilitar camp de rang d'edat
country:
description: Aquest camp és una llista de països. Si está activat, l'usuari
haurà de triar un país.
@@ -89,10 +94,17 @@ ca:
update:
failure: S'ha produït un error en l'actualització
success: Camps d'usuari addicionals actualitzats correctament a l'organització
+ age_ranges:
+ 17_to_30: De 17 a 30
+ 31_to_60: De 31 a 60
+ 61_or_more: 61 o més
+ prefer_not_to_say: Prefereixo no dir-ho
+ up_to_16: 16 o menys
genders:
female: Dona
male: Home
other: Altre
+ prefer_not_to_say: Prefereixo no dir-ho
registration_form:
signup:
legend: Més informació
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 50d9c8d..f9f7066 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -3,9 +3,10 @@ de:
activemodel:
attributes:
user:
+ age_range: Wie alt sind Sie?
country: Land
date_of_birth: Geburtsdatum
- gender: Geschlecht
+ gender: Welches Geschlecht identifizieren Sie?
location: Standort
phone_number: Telefonnummer
postal_code: Postleitzahl
@@ -14,7 +15,8 @@ de:
user:
attributes:
date_of_birth:
- underage: ungültig. Wenn Sie minderjährig sind, müssen Sie die Erlaubnis der Eltern einholen
+ underage: ungültig. Wenn Sie minderjährig sind, müssen Sie die Erlaubnis
+ der Eltern einholen
decidim:
admin:
actions:
@@ -33,27 +35,40 @@ de:
users: Teilnehmer
extra_user_fields:
fields:
+ age_range:
+ description: Dieses Feld ist eine Liste von Altersgruppen. Der Benutzer
+ kann eine Altersgruppe auswählen.
+ label: Das Feld Altersgruppe aktivieren
country:
- description: Dieses Feld enthält eine Liste von Ländern. Der Benutzer kann ein Land auswählen.
+ description: Dieses Feld enthält eine Liste von Ländern. Der Benutzer
+ kann ein Land auswählen.
label: Das Feld Land aktivieren
date_of_birth:
- description: Dieses Feld ist ein Feld für das Geburtsdatum. Der Benutzer kann ein Datum auswählen.
+ description: Dieses Feld ist ein Feld für das Geburtsdatum. Der Benutzer
+ kann ein Datum auswählen.
label: Das Feld Geburtsdatum aktivieren
gender:
- description: Dieses Feld ist ein Feld für die Geschlechtsidentität. Der Benutzer kann ein Geschlecht auswählen.
+ description: Dieses Feld ist ein Feld für die Geschlechtsidentität.
+ Der Benutzer kann ein Geschlecht auswählen.
label: Das Feld Geschlecht aktivieren
location:
- description: Dieses Feld ermöglicht das Hinzufügen von Text. Der Benutzer kann einen Ort auswählen.
+ description: Dieses Feld ermöglicht das Hinzufügen von Text. Der Benutzer
+ kann einen Ort auswählen.
label: Das Feld Standort aktivieren
phone_number:
- description: Dieses Feld ist ein Telefonnummernfeld. Der Benutzer kann eine Nummer auswählen.
+ description: Dieses Feld ist ein Telefonnummernfeld. Der Benutzer kann
+ eine Nummer auswählen.
label: Das Feld Telefonnummer aktivieren
postal_code:
- description: Dieses Feld ist für die Postleitzahl. Der Benutzer kann eine Postleitzahl auswählen.
+ description: Dieses Feld ist für die Postleitzahl. Der Benutzer kann
+ eine Postleitzahl auswählen.
label: Das Postleitzahlenfeld aktivieren.
form:
callout:
- help: Aktivieren Sie die Funktion für benutzerdefinierte Anmeldefelder, um zusätzliche Felder in Ihrem Anmeldeformular zu verwalten. Auch bei aktivierter Option wird das Anmeldeformular nur aktualisiert, wenn mindestens ein zusätzliches Feld aktiviert ist.
+ help: Aktivieren Sie die Funktion für benutzerdefinierte Anmeldefelder,
+ um zusätzliche Felder in Ihrem Anmeldeformular zu verwalten. Auch
+ bei aktivierter Option wird das Anmeldeformular nur aktualisiert,
+ wenn mindestens ein zusätzliches Feld aktiviert ist.
extra_user_fields:
extra_user_fields_enabled: Benutzerdefinierte Anmeldefelder aktivieren
section: Verfügbare Anmeldefelder für das Anmeldeformular
@@ -65,10 +80,17 @@ de:
update:
failure: Bei der Aktualisierung ist ein Fehler aufgetreten.
success: Die Anmeldefelder wurden erfolgreich aktualisiert.
+ age_ranges:
+ 17_to_30: 17 bis 30
+ 31_to_60: 31 bis 60
+ 61_or_more: 61 oder älter
+ prefer_not_to_say: Bevorzuge es, nicht zu sagen
+ up_to_16: 16 oder jünger
genders:
female: Frau
male: Mann
other: Divers
+ prefer_not_to_say: Bevorzuge es, nicht zu sagen
registration_form:
signup:
legend: Weitere Informationen
diff --git a/config/locales/en.yml b/config/locales/en.yml
index af86e18..4390e29 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,9 +3,10 @@ en:
activemodel:
attributes:
user:
+ age_range: How old are you?
country: Country
date_of_birth: Date of birth
- gender: Gender
+ gender: Which gender do you identify with?
location: Location
phone_number: Phone Number
postal_code: Postal code
@@ -34,7 +35,16 @@ en:
exports:
users: Participants
extra_user_fields:
+ boolean_fields:
+ ngo:
+ description: This field is a Boolean field. User will be able to check
+ if is a NGO
+ label: Enable NGO field
fields:
+ age_range:
+ description: This field is a list of age ranges. If checked, user will
+ have to choose an age range
+ label: Enable age range field
country:
description: This field is a list of countries. If checked, user will
have to choose a country
@@ -78,22 +88,55 @@ en:
extra_user_fields:
extra_user_fields_enabled: Enable extra user fields
section: Available extra fields for signup form
+ section_extras: Additional custom fields
+ section_extras_description: If you have configured any extra user fields,
+ you can manage them here (See section "Configuration through an initializer"
+ in the plugin README).
global:
title: Activate / deactivate functionality
index:
save: Save configuration
title: Manage extra user fields
+ select_fields:
+ participant_type:
+ description: This field is a list of participant types. If checked,
+ user will have to choose a participant type
+ label: Enable participant type field
+ text_fields:
+ motto:
+ description: This field is a String field. If checked, user can fill
+ in a personal phrase or motto
+ label: Enable "My Motto" field
update:
failure: An error occurred on update
success: Extra user fields correctly updated in organization
+ age_ranges:
+ 17_to_30: 17 to 30
+ 31_to_60: 31 to 60
+ 61_or_more: 61 or older
+ prefer_not_to_say: Prefer not to say
+ up_to_16: 16 or younger
+ boolean_fields:
+ ngo:
+ label: I am a member of a non-governmental organization (NGO)
+ errors:
+ select_fields: The field "%{field}" is not valid.
genders:
female: Female
male: Male
other: Other
+ prefer_not_to_say: Prefer not to say
registration_form:
signup:
legend: More information
underage: I am under %{limit} years old and I agree to get a parental authorization
+ select_fields:
+ participant_type:
+ label: Are you participating as an individual, or officially on behalf of
+ an organization?
+ text_fields:
+ motto:
+ label: What is your motto?
statutory_representative:
inform:
body: |
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 5df4c30..79836b9 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -3,9 +3,10 @@ es:
activemodel:
attributes:
user:
+ age_range: Cuántos años tienes?
country: País
date_of_birth: Fecha de nacimiento
- gender: Género
+ gender: Con qué género te identificas?
location: Localización
phone_number: Teléfono
postal_code: Código postal
@@ -36,6 +37,10 @@ es:
users: Participantes
extra_user_fields:
fields:
+ age_range:
+ description: Este campo es una lista de rangos de edad. Si está marcado,
+ el usuario tendrá que elegir un rango de edad.
+ label: Habilitar campo de rango de edad
country:
description: Este campo es una lista de países. Si está marcado, el
usuario tendrá que elegir un país.
@@ -89,10 +94,17 @@ es:
failure: Se ha producido un error en la actualización
success: Campos de usuario adicionales actualizados correctamente en la
organización
+ age_ranges:
+ 17_to_30: 17 a 30
+ 31_to_60: 31 a 60
+ 61_or_more: 61 o más
+ prefer_not_to_say: Prefiero no decirlo
+ up_to_16: 16 o menos
genders:
female: Mujer
male: Hombre
other: Otro
+ prefer_not_to_say: Prefiero no decirlo
registration_form:
signup:
legend: Más información
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
new file mode 100644
index 0000000..dcbe168
--- /dev/null
+++ b/config/locales/eu.yml
@@ -0,0 +1,89 @@
+---
+eu:
+ activemodel:
+ attributes:
+ user:
+ age_range: Zenbat urte dituzu?
+ country: Herria
+ date_of_birth: Jaioteguna
+ gender: Zer generotako pertsona zara?
+ location: Helbidea
+ phone_number: Telefono zenbakia
+ postal_code: Posta kodea
+ decidim:
+ admin:
+ actions:
+ export: Esportatu
+ exports:
+ export_as: "%{export_format} gisa esportatu"
+ extra_user_fields:
+ menu:
+ title: Kudeatu extra user fields
+ components:
+ extra_user_fields:
+ name: ExtraUserFields
+ extra_user_fields:
+ admin:
+ exports:
+ users: Parte-hartzaileak
+ extra_user_fields:
+ fields:
+ age_range:
+ description: Eremu hau adin tarte bat da. Erabiltzaileek adin tarte
+ bat aukeratu ahal izango dute.
+ label: Adin tartearen eremua aktibatu
+ country:
+ description: Eremu hau herrien zerrenda bat da. Erabiltzaileek herri
+ bat aukeratu ahal izango dute.
+ label: Herriaren eremua aktibatu
+ date_of_birth:
+ description: Eremu hau data bat da. Erabiltzaileak bere jaioteguna jarri
+ ahal izango du data aukeratuz.
+ label: Jaiotegunaren eremua aktibatu
+ gender:
+ description: Eremu hau generoen zerrenda bat da. Erabiltzaileak generoa
+ aukeratu ahal izango du erregistroa egitean.
+ label: Generoaren eremua aktibatu
+ location:
+ description: Eremu hau testua da. Erabiltzaileak helbidea idatzi ahal
+ izango du bertan.
+ label: Helbidearen eremua aktibatu
+ phone_number:
+ description: Eremu hau testua da. Erabiltzaileak bere telefono zenbakia
+ idatzi ahal izango du bertan.
+ label: Telefono zenbakiaren eremua aktibatu
+ postal_code:
+ description: Eremu hau testua da. Erabiltzaileak bere posta kodea idatzi
+ ahal izango du bertan.
+ label: Posta kodearen eremua aktibatu
+ form:
+ callout:
+ help: Extra user fields-en funtzionaltasunak aktibatu. Honi esker erregistroa
+ egiteko unean eremu gehigarriak agertuko dira. Gogoratu aukera hau
+ aktibatuta ere, erregistroaren formularioan behean aktibatutako
+ eremuak baino ez dituela gehituko.
+ extra_user_fields:
+ extra_user_fields_enabled: Extra User Fields aktibatu
+ section: Eregistroa egiteko formularioan erabilgarri dauden eremu gehigarriak.
+ global:
+ title: Funtzionatasuna Aktibatu / Desaktibatu
+ index:
+ save: Ezarpenak gorde
+ title: Extra user fields kudeatu
+ update:
+ failure: Erakundearen datuak eguneratzean errore bat sortu da
+ success: Extra user fields zuzen eguneratu dira erakundean
+ age_ranges:
+ 17_to_30: 17tik 30era
+ 31_to_60: 31tik 60ra
+ 61_or_more: 61 edo gehiago
+ prefer_not_to_say: Ez esan nahi
+ up_to_16: 16 edo gutxiago
+ genders:
+ female: Emakumea
+ male: Gizona
+ other: Beste bat
+ prefer_not_to_say: Ez esan nahi
+ registration_form:
+ signup:
+ legend: Argibide gehiago
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index fd9beea..32842e0 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -3,9 +3,10 @@ fr:
activemodel:
attributes:
user:
+ age_range: Quel âge avez-vous?
country: Pays
date_of_birth: Date de naissance
- gender: Genre
+ gender: Quel genre identifiez-vous?
location: Localisation
phone_number: Numéro de téléphone
postal_code: Code postal
@@ -35,7 +36,16 @@ fr:
exports:
users: Participants
extra_user_fields:
+ boolean_fields:
+ ngo:
+ description: Ce champ est un champ booléen. L'utilisateur pourra cocher
+ s'il représente une ONG.
+ label: Activer le champ ONG
fields:
+ age_range:
+ description: Ce champ est une liste de tranches d'âge. L'utilisateur
+ pourra choisir une tranche d'âge.
+ label: Activer le champ tranche d'âge
country:
description: Ce champ contient une liste de pays. L'utilisateur pourra
choisir un pays.
@@ -80,23 +90,55 @@ 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
+ text_fields:
+ motto:
+ description: Ce champ permet l'ajout de texte. L'utilisateur pourra
+ choisir un slogan.
+ label: Activer le champ slogan
update:
failure: Une erreur est survenue lors de la mise à jour
success: Les champs d'inscription ont été mis à jour avec succ§s
+ age_ranges:
+ 17_to_30: 17 à 30
+ 31_to_60: 31 à 60
+ 61_or_more: 61 ou plus
+ prefer_not_to_say: Préfère ne pas dire
+ up_to_16: 16 ou moins
+ boolean_fields:
+ ngo:
+ label: Activer le champ ONG
+ errors:
+ select_fields: Le champ "%{field}" n'est pas valide.
genders:
female: Femme
male: Homme
other: Autre
+ prefer_not_to_say: Préfère ne pas dire
registration_form:
signup:
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
+ text_fields:
+ motto:
+ label: Activer le champ "Mon slogan"
statutory_representative:
inform:
body: |
diff --git a/decidim-extra_user_fields.gemspec b/decidim-extra_user_fields.gemspec
index 50077d9..847fa10 100644
--- a/decidim-extra_user_fields.gemspec
+++ b/decidim-extra_user_fields.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
s.email = ["fernando@populate.tools"]
s.license = "AGPL-3.0"
s.homepage = "https://github.com/PopulateTools/decidim-module-extra_user_fields"
- s.required_ruby_version = ">= 3.0.2"
+ s.required_ruby_version = ">= 3.3.0"
s.name = "decidim-extra_user_fields"
s.summary = "Decidim module to add extra fields to users."
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.files = Dir["{app,config,lib}/**/*", "LICENSE-AGPLv3.txt", "Rakefile", "README.md"]
- s.add_dependency "country_select", "~> 4.0"
+ s.add_dependency "country_select", "~> 10.0"
s.add_dependency "decidim-core", Decidim::ExtraUserFields.decidim_version
s.add_dependency "deface", "~> 1.5"
end
diff --git a/lib/decidim/extra_user_fields.rb b/lib/decidim/extra_user_fields.rb
index e21bce3..022dc46 100644
--- a/lib/decidim/extra_user_fields.rb
+++ b/lib/decidim/extra_user_fields.rb
@@ -8,5 +8,73 @@
module Decidim
# This namespace holds the logic of the `ExtraUserFields` module.
module ExtraUserFields
+ include ActiveSupport::Configurable
+
+ config_accessor :underage_limit do
+ ENV.fetch("EXTRA_USER_FIELDS_UNDERAGE_LIMIT", 18).to_i
+ end
+
+ config_accessor :underage_options do
+ ENV.fetch("EXTRA_USER_FIELDS_UNDERAGE_OPTIONS", "15 16 17 18 19 20 21").split.map(&:to_i)
+ end
+
+ # These options require the I18n translations to be set in the locale files.
+ # decidim.extra_user_fields.genders.female
+ # decidim.extra_user_fields.genders.male
+ # decidim.extra_user_fields.genders. ...
+ config_accessor :genders do
+ ENV.fetch("EXTRA_USER_FIELDS_GENDERS", "female male other prefer_not_to_say").split
+ end
+
+ # These options require the I18n translations to be set in the locale files.
+ # decidim.extra_user_fields.age_range.up_to_16
+ # decidim.extra_user_fields.age_range.17_to_30
+ # decidim.extra_user_fields.age_range. ...
+ config_accessor :age_ranges do
+ ENV.fetch("EXTRA_USER_FIELDS_AGE_RANGES", "up_to_16 17_to_30 31_to_60 61_or_more prefer_not_to_say").split
+ end
+
+ # If extra select fields are needed, they can be added as a Hash here.
+ # The key is the field name and the value is a hash with the options.
+ # You can (optionally) add I18n keys for the options (if not the text will be used as it is).
+ # For the user interface, you can defined labels and descriptions for the fields (optionally):
+ # decidim.extra_user_fields.select_fields.field_name.label
+ # decidim.extra_user_fields.select_fields.field_name.description
+ # For the admin interface, you can defined labels and descriptions for the fields (optionally):
+ # decidim.extra_user_fields.admin.extra_user_fields.select_fields.field_name.label
+ # decidim.extra_user_fields.admin.extra_user_fields.select_fields.field_name.description
+ config_accessor :select_fields do
+ {
+ participant_type: {
+ # "" => "",
+ "individual" => "decidim.extra_user_fields.participant_types.individual",
+ "organization" => "decidim.extra_user_fields.participant_types.organization"
+ }
+ }
+ end
+
+ # If extra boolean fields are needed, they can be added as an Array here.
+ # For the user interface, you can defined labels and descriptions for the fields (optionally):
+ # decidim.extra_user_fields.boolean_fields.field_name.label
+ # decidim.extra_user_fields.boolean_fields.field_name.description
+ # For the admin interface, you can defined labels and descriptions for the fields (optionally):
+ # decidim.extra_user_fields.admin.extra_user_fields.boolean_fields.field_name.label
+ # decidim.extra_user_fields.admin.extra_user_fields.boolean_fields.field_name.description
+ config_accessor :boolean_fields do
+ [:ngo]
+ end
+
+ # If extra text fields are needed, they can be added as a Hash here (key is the field, value whether mandatory or not).
+ # For the user interface, you can defined labels and descriptions for the fields (optionally):
+ # decidim.extra_user_fields.text_fields.field_name.label
+ # decidim.extra_user_fields.text_fields.field_name.description
+ # For the admin interface, you can defined labels and descriptions for the fields (optionally):
+ # decidim.extra_user_fields.admin.extra_user_fields.text_fields.field_name.label
+ # decidim.extra_user_fields.admin.extra_user_fields.text_fields.field_name.description
+ config_accessor :text_fields do
+ {
+ motto: false
+ }
+ end
end
end
diff --git a/lib/decidim/extra_user_fields/admin_engine.rb b/lib/decidim/extra_user_fields/admin_engine.rb
index 0c058a3..e398626 100644
--- a/lib/decidim/extra_user_fields/admin_engine.rb
+++ b/lib/decidim/extra_user_fields/admin_engine.rb
@@ -17,7 +17,7 @@ class AdminEngine < ::Rails::Engine
end
resources :extra_user_fields, only: [:index]
- match "/extra_user_fields" => "extra_user_fields#update", :via => :patch, as: "update"
+ match "/extra_user_fields" => "extra_user_fields#update", :via => :patch, :as => "update"
root to: "extra_user_fields#index"
end
diff --git a/lib/decidim/extra_user_fields/engine.rb b/lib/decidim/extra_user_fields/engine.rb
index e6a1cb6..7894dc7 100644
--- a/lib/decidim/extra_user_fields/engine.rb
+++ b/lib/decidim/extra_user_fields/engine.rb
@@ -11,12 +11,6 @@ module ExtraUserFields
class Engine < ::Rails::Engine
isolate_namespace Decidim::ExtraUserFields
- DEFAULT_GENDER_OPTIONS = [:male, :female, :other].freeze
-
- DEFAULT_UNDERAGE_LIMIT = 18
-
- DEFAULT_UNDERAGE_OPTIONS = (15..21)
-
routes do
# Add engine routes here
# resources :extra_user_fields
diff --git a/lib/decidim/extra_user_fields/form_builder_methods.rb b/lib/decidim/extra_user_fields/form_builder_methods.rb
index a1345a3..df3c7b6 100644
--- a/lib/decidim/extra_user_fields/form_builder_methods.rb
+++ b/lib/decidim/extra_user_fields/form_builder_methods.rb
@@ -5,13 +5,31 @@ module ExtraUserFields
# This module adds the FormBuilder methods for extra user fields
module FormBuilderMethods
def custom_country_select(name, options = {})
- label_text = options[:label].to_s
- label_text = label_for(name) if label_text.blank?
+ label_text = options[:label].presence || label_for(name)
+ html = +""
+ html << (label_text + required_for_attribute(name)) if options.fetch(:label, true)
+ html << sanitize_country_select(country_select(name))
+ html.html_safe
+ end
+
+ def phone_field(attribute, options = {})
+ field(attribute, options) do |opts|
+ if opts[:placeholder].blank? && object.respond_to?(:"#{attribute}_extra_user_field_placeholder")
+ opts[:placeholder] = translated_attribute(object.send(:"#{attribute}_extra_user_field_placeholder"))
+ end
+
+ opts[:pattern] ||= object.send(:"#{attribute}_extra_user_field_pattern") if object.respond_to?(:"#{attribute}_extra_user_field_pattern")
+ opts[:type] = "tel"
+
+ @template.text_field(@object_name, attribute, objectify_options(opts))
+ end
+ end
+
+ private
- template = ""
- template += (label_text + required_for_attribute(name)) if options.fetch(:label, true)
- template += country_select(name)
- template.html_safe
+ # Remove non-standard attrs added by country_select that fail HTML/accessibility validation
+ def sanitize_country_select(html)
+ html.gsub(/\s(skip_default_ids|allow_method_names_outside_object)="[^"]*"/, "")
end
end
end
diff --git a/lib/decidim/extra_user_fields/version.rb b/lib/decidim/extra_user_fields/version.rb
index f28f7fe..f0ac56c 100644
--- a/lib/decidim/extra_user_fields/version.rb
+++ b/lib/decidim/extra_user_fields/version.rb
@@ -4,11 +4,11 @@ module Decidim
# This holds the decidim-extra_user_fields version.
module ExtraUserFields
def self.version
- "0.28.0"
+ "0.31.0"
end
def self.decidim_version
- [">= 0.28"].freeze
+ [">= 0.31"].freeze
end
end
end
diff --git a/lib/tasks/decidim_extra_user_fields_upgrade_tasks.rake b/lib/tasks/decidim_extra_user_fields_upgrade_tasks.rake
new file mode 100644
index 0000000..5fdb868
--- /dev/null
+++ b/lib/tasks/decidim_extra_user_fields_upgrade_tasks.rake
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Rake::Task["decidim:choose_target_plugins"].enhance do
+ ENV["FROM"] = "#{ENV.fetch("FROM", nil)},decidim_extra_user_fields"
+end
diff --git a/spec/commands/decidim/create_omniauth_registration_spec.rb b/spec/commands/decidim/create_omniauth_registration_spec.rb
index a87436a..e47ea21 100644
--- a/spec/commands/decidim/create_omniauth_registration_spec.rb
+++ b/spec/commands/decidim/create_omniauth_registration_spec.rb
@@ -12,23 +12,42 @@ module Comments
let(:uid) { "12345" }
let(:oauth_signature) { OmniauthRegistrationForm.create_signature(provider, uid) }
let(:verified_email) { email }
+ let(:tos_agreement) { true }
let(:country) { "Argentina" }
let(:date_of_birth) { "01/01/2000" }
let(:gender) { "other" }
+ let(:age_range) { "17_to_30" }
let(:location) { "Paris" }
let(:phone_number) { "0123456789" }
let(:postal_code) { "75001" }
let(:underage) { false }
+ let(:select_fields) do
+ {
+ "participant_type" => "individual"
+ }
+ end
+ let(:boolean_fields) do
+ ["ngo"]
+ end
+ let(:text_fields) do
+ {
+ "motto" => "I think, therefore I am"
+ }
+ end
let(:statutory_representative_email) { nil }
let(:extended_data) do
{
country:,
date_of_birth:,
gender:,
+ age_range:,
location:,
phone_number:,
postal_code:,
underage:,
+ select_fields:,
+ boolean_fields:,
+ text_fields:,
statutory_representative_email:
}
end
@@ -44,13 +63,18 @@ module Comments
"nickname" => "facebook_user",
"oauth_signature" => oauth_signature,
"avatar_url" => "http://www.example.com/foo.jpg",
+ "tos_agreement" => tos_agreement,
"country" => country,
"postal_code" => postal_code,
"date_of_birth" => date_of_birth,
"gender" => gender,
+ "age_range" => age_range,
"phone_number" => phone_number,
"location" => location,
"underage" => underage,
+ "select_fields" => select_fields,
+ "boolean_fields" => boolean_fields,
+ "text_fields" => text_fields,
"statutory_representative_email" => statutory_representative_email
}
}
@@ -112,6 +136,18 @@ module Comments
expect(user.newsletter_notifications_at).to be_nil
expect(user).to be_confirmed
expect(user.valid_password?("decidim123456789")).to be(true)
+
+ expect(user.extended_data["country"]).to eq(country)
+ expect(user.extended_data["postal_code"]).to eq(postal_code)
+ expect(user.extended_data["date_of_birth"]).to eq(date_of_birth.to_date.iso8601)
+ expect(user.extended_data["gender"]).to eq(gender)
+ expect(user.extended_data["age_range"]).to eq(age_range)
+ expect(user.extended_data["phone_number"]).to eq(phone_number)
+ expect(user.extended_data["location"]).to eq(location)
+ expect(user.extended_data["underage"]).to eq(underage)
+ expect(user.extended_data["select_fields"]).to eq(select_fields)
+ expect(user.extended_data["boolean_fields"]).to eq(boolean_fields)
+ expect(user.extended_data["text_fields"]).to eq(text_fields)
end
# NOTE: This is important so that the users who are only
@@ -128,7 +164,7 @@ module Comments
user = create(:user, email:, organization:)
identity = Decidim::Identity.new(id: 1234)
allow(command).to receive(:create_identity).and_return(identity)
-
+ puts "user id in test: #{user.id}, tos_agreement: #{user.tos_agreement}"
expect(ActiveSupport::Notifications)
.to receive(:publish)
.with(
@@ -141,7 +177,10 @@ module Comments
name: "Facebook User",
nickname: "facebook_user",
avatar_url: "http://www.example.com/foo.jpg",
- raw_data: {}
+ raw_data: {},
+ tos_agreement: true,
+ accepted_tos_version: user.accepted_tos_version,
+ newsletter_notifications_at: user.newsletter_notifications_at
)
command.call
end
diff --git a/spec/commands/decidim/create_registration_spec.rb b/spec/commands/decidim/create_registration_spec.rb
index 080fde6..3fdbcb2 100644
--- a/spec/commands/decidim/create_registration_spec.rb
+++ b/spec/commands/decidim/create_registration_spec.rb
@@ -18,10 +18,24 @@ module Comments
let(:country) { "Argentina" }
let(:date_of_birth) { "01/01/2000" }
let(:gender) { "other" }
+ let(:age_range) { "17_to_30" }
let(:location) { "Paris" }
let(:phone_number) { "0123456789" }
let(:postal_code) { "75001" }
let(:underage) { "0" }
+ let(:select_fields) do
+ {
+ participant_type: "individual"
+ }
+ end
+ let(:boolean_fields) do
+ ["ngo"]
+ end
+ let(:text_fields) do
+ {
+ motto: "I think, therefore I am"
+ }
+ end
let(:statutory_representative_email) { nil }
let(:extended_data) do
{
@@ -32,6 +46,7 @@ module Comments
phone_number:,
postal_code:,
underage:,
+ age_range:,
statutory_representative_email:
}
end
@@ -49,9 +64,13 @@ module Comments
"postal_code" => postal_code,
"date_of_birth" => date_of_birth,
"gender" => gender,
+ "age_range" => age_range,
"phone_number" => phone_number,
"location" => location,
"underage" => underage,
+ "select_fields" => select_fields,
+ "boolean_fields" => boolean_fields,
+ "text_fields" => text_fields,
"statutory_representative_email" => statutory_representative_email
}
}
@@ -122,10 +141,14 @@ module Comments
country:,
date_of_birth: Date.parse(date_of_birth),
gender:,
+ age_range:,
location:,
phone_number:,
postal_code:,
underage:,
+ select_fields:,
+ boolean_fields:,
+ text_fields:,
statutory_representative_email:
}
).and_call_original
diff --git a/spec/commands/decidim/extra_user_fields/admin/update_extra_user_fields_spec.rb b/spec/commands/decidim/extra_user_fields/admin/update_extra_user_fields_spec.rb
index 3631000..72b4e5b 100644
--- a/spec/commands/decidim/extra_user_fields/admin/update_extra_user_fields_spec.rb
+++ b/spec/commands/decidim/extra_user_fields/admin/update_extra_user_fields_spec.rb
@@ -9,10 +9,11 @@ module Admin
let(:organization) { create(:organization, extra_user_fields: {}) }
let(:user) { create(:user, :admin, :confirmed, organization:) }
- let(:extra_user_fields_enabled) { true }
let(:postal_code) { true }
+ let(:extra_user_fields_enabled) { true }
let(:country) { true }
let(:gender) { true }
+ let(:age_range) { true }
let(:date_of_birth) { true }
let(:phone_number) { true }
let(:phone_number_pattern) { "^(\\+34)?[0-9 ]{9,12}$" }
@@ -20,17 +21,14 @@ module Admin
let(:location) { true }
let(:underage) { true }
let(:underage_limit) { 18 }
- # Block ExtraUserFields RspecVar
- # EndBlock
-
- # rubocop:disable Style/TrailingCommaInHashLiteral
let(:form_params) do
{
- "enabled" => extra_user_fields_enabled,
"postal_code" => postal_code,
+ "enabled" => extra_user_fields_enabled,
"country" => country,
"gender" => gender,
+ "age_range" => age_range,
"date_of_birth" => date_of_birth,
"phone_number" => phone_number,
"phone_number_pattern" => phone_number_pattern,
@@ -38,13 +36,11 @@ module Admin
"location" => location,
"underage" => underage,
"underage_limit" => underage_limit,
- # Block ExtraUserFields ExtraUserFields
-
- # EndBlock
+ "select_fields" => %w(participant_type non_existing_field),
+ "boolean_fields" => %w(ngo non_existing_field),
+ "text_fields" => %w(motto non_existing_field)
}
end
- # rubocop:enable Style/TrailingCommaInHashLiteral
-
let(:form) do
ExtraUserFieldsForm.from_params(
form_params
@@ -86,15 +82,17 @@ module Admin
expect(extra_user_fields).to include("enabled" => true)
expect(extra_user_fields).to include("country" => { "enabled" => true })
expect(extra_user_fields).to include("date_of_birth" => { "enabled" => true })
+ expect(extra_user_fields).to include("postal_code" => { "enabled" => true })
expect(extra_user_fields).to include("gender" => { "enabled" => true })
+ expect(extra_user_fields).to include("age_range" => { "enabled" => true })
expect(extra_user_fields).to include("country" => { "enabled" => true })
expect(extra_user_fields).to include("phone_number" => { "enabled" => true, "pattern" => phone_number_pattern, "placeholder" => phone_number_placeholder })
expect(extra_user_fields).to include("location" => { "enabled" => true })
expect(extra_user_fields).to include("underage" => { "enabled" => true })
expect(extra_user_fields).to include("underage_limit" => 18)
- # Block ExtraUserFields InclusionSpec
-
- # EndBlock
+ expect(extra_user_fields).to include("select_fields" => ["participant_type"])
+ expect(extra_user_fields).to include("boolean_fields" => ["ngo"])
+ expect(extra_user_fields).to include("text_fields" => ["motto"])
end
end
end
diff --git a/spec/factories.rb b/spec/factories.rb
index 3fda653..51cf3a7 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -9,7 +9,10 @@
create_static_pages { true }
end
- name { Faker::Company.unique.name }
+ name do
+ Decidim.available_locales.index_with { |_locale| Faker::Company.unique.name }
+ end
+
reference_prefix { Faker::Name.suffix }
time_zone { "UTC" }
twitter_handler { Faker::Hipster.word }
@@ -25,7 +28,6 @@
users_registration_mode { :enabled }
official_img_footer { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
official_url { Faker::Internet.url }
- highlighted_content_banner_enabled { false }
enable_omnipresent_banner { false }
badges_enabled { true }
user_groups_enabled { true }
@@ -34,7 +36,7 @@
admin_terms_of_service_body { Decidim::Faker::Localized.wrapped("
+
+<% end %>
diff --git a/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_text_fields.html.erb b/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_text_fields.html.erb
new file mode 100644
index 0000000..74b5d23
--- /dev/null
+++ b/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_text_fields.html.erb
@@ -0,0 +1,15 @@
+<% custom_text_fields(form).each do |field, checked| %>
+
+ <%= label_tag "extra_user_fields_select_field_#{field}" do %>
+
+ <%= check_box_tag "extra_user_fields[select_fields][]",
+ field,
+ checked,
+ id: "extra_user_fields_select_field_#{field}" %>
+ <%= t("decidim.extra_user_fields.admin.extra_user_fields.select_fields.#{field}.label", default: field.to_s.humanize ) %>
+ <%= t("decidim.extra_user_fields.admin.extra_user_fields.select_fields.#{field}.description", default: "") %>
+ <% end %>
+
+
+
+<% end %>
diff --git a/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_underage.html.erb b/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_underage.html.erb
index 2713630..0f23eb8 100644
--- a/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_underage.html.erb
+++ b/app/views/decidim/extra_user_fields/admin/extra_user_fields/fields/_underage.html.erb
@@ -2,6 +2,6 @@
+ <%= label_tag "extra_user_fields_select_field_#{field}" do %>
+
+ <%= check_box_tag "extra_user_fields[text_fields][]",
+ field,
+ checked,
+ id: "extra_user_fields_select_field_#{field}" %>
+ <%= t("decidim.extra_user_fields.admin.extra_user_fields.text_fields.#{field}.label", default: field.to_s.humanize ) %>
+ <%= t("decidim.extra_user_fields.admin.extra_user_fields.text_fields.#{field}.description", default: "") %>
+ <% end %>
+
+ <%= t(".description") %>
<%= form.check_box :underage, label: t(".label") %> - <%= form.select :underage_limit, ( Decidim::ExtraUserFields::Engine::DEFAULT_UNDERAGE_OPTIONS).to_a, selected: current_organization.extra_user_fields["underage_limit"] || Decidim::ExtraUserFields::Engine::DEFAULT_UNDERAGE_LIMIT, label: t(".limit") %> + <%= form.select :underage_limit, ( Decidim::ExtraUserFields.underage_options).to_a, selected: current_organization.extra_user_fields["underage_limit"] || Decidim::ExtraUserFields.underage_limit, label: t(".limit") %>", "
") { generate_localized_title } } force_users_to_authenticate_before_access_organization { false } machine_translation_display_priority { "original" } - external_domain_whitelist { ["example.org", "twitter.com", "facebook.com", "youtube.com", "github.com", "mytesturl.me"] } + external_domain_allowlist { ["example.org", "twitter.com", "facebook.com", "youtube.com", "github.com", "mytesturl.me"] } smtp_settings do { "from" => "test@example.org", diff --git a/spec/forms/decidim/account_form_spec.rb b/spec/forms/decidim/account_form_spec.rb index ad76c2d..cae1046 100644 --- a/spec/forms/decidim/account_form_spec.rb +++ b/spec/forms/decidim/account_form_spec.rb @@ -22,9 +22,13 @@ module Decidim postal_code:, date_of_birth:, gender:, + age_range:, phone_number:, location:, underage:, + select_fields:, + boolean_fields:, + text_fields:, statutory_representative_email: ).with_context( current_organization: organization, @@ -44,7 +48,10 @@ module Decidim "phone_number" => { "enabled" => true, "pattern" => phone_number_pattern, "placeholder" => nil }, "location" => { "enabled" => true }, "underage" => { "enabled" => true }, - "underage_limit" => 18 + "underage_limit" => 18, + "select_fields" => ["participant_type"], + "boolean_fields" => ["ngo"], + "text_fields" => ["motto"] } end let(:phone_number_pattern) { "^(\\+34)?[0-9 ]{9,12}$" } @@ -62,10 +69,24 @@ module Decidim let(:country) { "Argentina" } let(:date_of_birth) { "01/01/2000" } let(:gender) { "other" } + let(:age_range) { "17_to_30" } let(:location) { "Paris" } let(:phone_number) { "0123456789" } let(:postal_code) { "75001" } let(:underage) { "0" } + let(:select_fields) do + { + participant_type: "individual" + } + end + let(:boolean_fields) do + ["ngo"] + end + let(:text_fields) do + { + motto: false + } + end let(:statutory_representative_email) { nil } context "with correct data" do @@ -90,6 +111,54 @@ module Decidim end end + context "with non configured select fields" do + let(:select_fields) do + { + participant_type: "individual", + foo: "bar" + } + end + + it "is valid" do + expect(subject).to be_valid + end + end + + context "with incorrect select fields" do + let(:select_fields) do + { + participant_type: "i_dont_exist" + } + end + + it "is invalid" do + expect(subject).not_to be_valid + end + end + + context "with non configured boolean fields" do + let(:boolean_fields) do + [:ngo, :foo] + end + + it "is valid" do + expect(subject).to be_valid + end + end + + context "with non configured text fields" do + let(:text_fields) do + { + motto: false, + foo: true + } + end + + it "is valid" do + expect(subject).to be_valid + end + end + describe "name" do context "with an empty name" do let(:name) { "" } @@ -125,14 +194,6 @@ module Decidim expect(subject).not_to be_valid end end - - context "and belongs to a group" do - let!(:existing_group) { create(:user_group, email:, organization:) } - - it "is invalid" do - expect(subject).not_to be_valid - end - end end context "when it is already in use in another organization" do @@ -161,14 +222,6 @@ module Decidim expect(subject).not_to be_valid end end - - context "and belongs to a group" do - let!(:existing_group) { create(:user_group, nickname:, organization:) } - - it "is invalid" do - expect(subject).not_to be_valid - end - end end context "when it is already in use in another organization" do diff --git a/spec/forms/decidim/omniauth_registration_form_spec.rb b/spec/forms/decidim/omniauth_registration_form_spec.rb index 3b25b82..9650070 100644 --- a/spec/forms/decidim/omniauth_registration_form_spec.rb +++ b/spec/forms/decidim/omniauth_registration_form_spec.rb @@ -21,9 +21,24 @@ module Decidim let(:country) { "Argentina" } let(:date_of_birth) { "01/01/2000" } let(:gender) { "other" } + let(:age_range) { "17_to_30" } let(:location) { "Paris" } let(:phone_number) { "0123456789" } let(:postal_code) { "75001" } + let(:underage) { false } + let(:select_fields) do + { + "participant_type" => "individual" + } + end + let(:boolean_fields) do + ["ngo"] + end + let(:text_fields) do + { + "motto" => false + } + end let(:attributes) do { @@ -38,8 +53,13 @@ module Decidim postal_code:, date_of_birth:, gender:, + age_range:, phone_number:, - location: + location:, + underage:, + select_fields:, + boolean_fields:, + text_fields: } end diff --git a/spec/forms/decidim/registration_form_spec.rb b/spec/forms/decidim/registration_form_spec.rb index 7d46383..08240ec 100644 --- a/spec/forms/decidim/registration_form_spec.rb +++ b/spec/forms/decidim/registration_form_spec.rb @@ -22,6 +22,7 @@ module Decidim "postal_code" => { "enabled" => true }, "date_of_birth" => { "enabled" => true }, "gender" => { "enabled" => true }, + "age_range" => { "enabled" => true }, "phone_number" => { "enabled" => true, "pattern" => phone_number_pattern, "placeholder" => nil }, "location" => { "enabled" => true } } @@ -35,6 +36,7 @@ module Decidim let(:country) { "Argentina" } let(:date_of_birth) { "01/01/2000" } let(:gender) { "other" } + let(:age_range) { "17_to_30" } let(:location) { "Paris" } let(:phone_number) { "0123456789" } let(:postal_code) { "75001" } @@ -50,6 +52,7 @@ module Decidim postal_code:, date_of_birth:, gender:, + age_range:, phone_number:, location: } @@ -103,12 +106,6 @@ module Decidim it { is_expected.not_to be_valid } end end - - context "and a user_group has the email" do - let!(:user_group) { create(:user_group, organization:, email:) } - - it { is_expected.not_to be_valid } - end end context "when the name is an email" do @@ -154,7 +151,7 @@ module Decidim context "when the nickname already exists" do context "and a user has the nickname" do - let!(:another_user) { create(:user, organization:, nickname: name.upcase) } + let!(:another_user) { create(:user, organization:, nickname: name) } it { is_expected.to be_valid } @@ -168,12 +165,6 @@ module Decidim it { is_expected.to be_valid } end end - - context "and a user_group has the nickname" do - let!(:user_group) { create(:user_group, organization:, nickname: name) } - - it { is_expected.to be_valid } - end end context "when the nickname is too long" do diff --git a/spec/jobs/decidim/extra_user_fields/admin/export_participants_job_spec.rb b/spec/jobs/decidim/extra_user_fields/admin/export_participants_job_spec.rb index 360facb..a92db59 100644 --- a/spec/jobs/decidim/extra_user_fields/admin/export_participants_job_spec.rb +++ b/spec/jobs/decidim/extra_user_fields/admin/export_participants_job_spec.rb @@ -11,24 +11,20 @@ module Admin let(:format) { "CSV" } it "sends an email with a file attached" do - ExportParticipantsJob.perform_now(organization, user, format) + perform_enqueued_jobs { ExportParticipantsJob.perform_now(organization, user, format) } email = last_email expect(email.subject).to include("participants") - attachment = email.attachments.first - - expect(attachment.read.length).to be_positive - expect(attachment.mime_type).to eq("application/zip") - expect(attachment.filename).to match(/^participants-[0-9]+-[0-9]+-[0-9]+-[0-9]+\.zip$/) + expect(last_email_body).to include("Your download is ready.") end context "when format is CSV" do it "uses the csv exporter" do - export_data = double + export_data = double(read: "", filename: "participants") expect(Decidim::Exporters::CSV).to(receive(:new).with(anything, Decidim::ExtraUserFields::UserExportSerializer)).and_return(double(export: export_data)) expect(ExportMailer) - .to(receive(:export).with(user, "participants", export_data)) - .and_return(double(deliver_now: true)) + .to(receive(:export).with(user, kind_of(Decidim::PrivateExport))) + .and_return(double(deliver_later: true)) ExportParticipantsJob.perform_now(organization, user, format) end end @@ -37,13 +33,13 @@ module Admin let(:format) { "JSON" } it "uses the json exporter" do - export_data = double + export_data = double(read: "", filename: "participants") expect(Decidim::Exporters::JSON) .to(receive(:new).with(anything, Decidim::ExtraUserFields::UserExportSerializer)) .and_return(double(export: export_data)) expect(ExportMailer) - .to(receive(:export).with(user, "participants", export_data)) - .and_return(double(deliver_now: true)) + .to(receive(:export).with(user, kind_of(Decidim::PrivateExport))) + .and_return(double(deliver_later: true)) ExportParticipantsJob.perform_now(organization, user, format) end end @@ -52,13 +48,13 @@ module Admin let(:format) { "Excel" } it "uses the excel exporter" do - export_data = double + export_data = double(read: "", filename: "participants") expect(Decidim::Exporters::Excel) .to(receive(:new).with(anything, Decidim::ExtraUserFields::UserExportSerializer)) .and_return(double(export: export_data)) expect(ExportMailer) - .to(receive(:export).with(user, "participants", export_data)) - .and_return(double(deliver_now: true)) + .to(receive(:export).with(user, kind_of(Decidim::PrivateExport))) + .and_return(double(deliver_later: true)) ExportParticipantsJob.perform_now(organization, user, format) end end diff --git a/spec/lib/overrides_spec.rb b/spec/lib/overrides_spec.rb new file mode 100644 index 0000000..7a746da --- /dev/null +++ b/spec/lib/overrides_spec.rb @@ -0,0 +1,44 @@ +# frozen_string_literal: true + +require "spec_helper" + +# We make sure that the checksum of the file overriden is the same +# as the expected. If this test fails, it means that the overriden +# file should be updated to match any change/bug fix introduced in the core +checksums = [ + { + package: "decidim-core", + files: { + "/app/commands/decidim/create_registration.rb" => "c2fafd313dbe16624e3ef07584e946cd", + "/app/commands/decidim/create_omniauth_registration.rb" => "31ce55b44db4e53151f11524d26d8832", + "/app/commands/decidim/update_account.rb" => "2c4f0e5a693b4b46a8e39e12dd9ecb2a", + "/app/models/decidim/organization.rb" => "977969a742ef2ef7515395fcf6951df7", + "/app/views/decidim/account/show.html.erb" => "1c230c5c6bc02e0bb22e1ea92b0da96c", + "/app/views/decidim/devise/registrations/new.html.erb" => "861b8821bbdc05e7b337fcdb921415ba", + "/app/views/decidim/devise/omniauth_registrations/new.html.erb" => "b972ec211ff96702d449cf6c8846a613" + } + }, + { + package: "decidim-admin", + files: { + "/app/views/decidim/admin/officializations/index.html.erb" => "e68f2a9b4887212f21756de25394ff53" + } + } +] + +describe "Overriden files", type: :view do + checksums.each do |item| + spec = Gem::Specification.find_by_name(item[:package]) + item[:files].each do |file, signature| + it "#{spec.gem_dir}#{file} matches checksum" do + expect(md5("#{spec.gem_dir}#{file}")).to eq(signature) + end + end + end + + private + + def md5(file) + Digest::MD5.hexdigest(File.read(file)) + end +end diff --git a/spec/models/decidim/organization_spec.rb b/spec/models/decidim/organization_spec.rb index 4760cfc..5dbfa91 100644 --- a/spec/models/decidim/organization_spec.rb +++ b/spec/models/decidim/organization_spec.rb @@ -32,6 +32,10 @@ module Decidim enabled: true, client_id: nil, client_secret: nil + }, + test: { + enabled: true, + icon: "tools-line" } } end @@ -71,22 +75,26 @@ module Decidim describe "enabled omniauth providers" do subject(:enabled_providers) { organization.enabled_omniauth_providers } + let!(:previous_omniauth_providers) { Decidim.omniauth_providers } + + after do + Decidim.omniauth_providers = previous_omniauth_providers + end + context "when omniauth_settings are nil" do - context "when providers are enabled in secrets.yml" do - it "returns providers enabled in secrets.yml" do + context "when providers are enabled" do + before do + allow(Decidim).to receive(:omniauth_providers).and_return(omniauth_secrets) + end + + it "returns providers enabled" do expect(enabled_providers).to eq(omniauth_secrets) end end - context "when providers are not enabled in secrets.yml" do - let!(:previous_omniauth_secrets) { Rails.application.secrets[:omniauth] } - + context "when providers are not enabled" do before do - Rails.application.secrets[:omniauth] = nil - end - - after do - Rails.application.secrets[:omniauth] = previous_omniauth_secrets + allow(Decidim).to receive(:omniauth_providers).and_return({}) end it "returns no providers" do diff --git a/spec/serializers/decidim/extra_user_fields/user_export_serializer_spec.rb b/spec/serializers/decidim/extra_user_fields/user_export_serializer_spec.rb index 6d4d12c..7864323 100644 --- a/spec/serializers/decidim/extra_user_fields/user_export_serializer_spec.rb +++ b/spec/serializers/decidim/extra_user_fields/user_export_serializer_spec.rb @@ -6,25 +6,25 @@ subject { described_class.new(resource) } let(:resource) { create(:user, extended_data: registration_metadata) } - # rubocop:disable Style/TrailingCommaInHashLiteral let(:registration_metadata) do { gender:, + age_range:, postal_code:, date_of_birth:, country:, phone_number:, location:, underage:, - statutory_representative_email:, - # Block ExtraUserFields ExtraUserFields - - # EndBlock + select_fields:, + boolean_fields:, + text_fields:, + statutory_representative_email: } end - # rubocop:enable Style/TrailingCommaInHashLiteral let(:gender) { "other" } + let(:age_range) { "17_to_30" } let(:postal_code) { "00000" } let(:date_of_birth) { "01/01/2000" } let(:country) { "Argentina" } @@ -33,9 +33,20 @@ let(:underage) { true } let(:underage_limit) { 18 } let(:statutory_representative_email) { "parent@example.org" } - # Block ExtraUserFields RspecVar + let(:select_fields) do + { + "participant_type" => "individual" + } + end + let(:boolean_fields) do + ["ngo"] + end + let(:text_fields) do + { + "motto" => "I think, therefore I am" + } + end - # EndBlock let(:serialized) { subject.serialize } describe "#serialize" do @@ -47,6 +58,10 @@ expect(serialized).to include(gender: resource.extended_data["gender"]) end + it "includes the age range" do + expect(serialized).to include(age_range: resource.extended_data["age_range"]) + end + it "includes the postal code" do expect(serialized).to include(postal_code: resource.extended_data["postal_code"]) end @@ -67,6 +82,18 @@ expect(serialized).to include(location: resource.extended_data["location"]) end + it "includes the select fields" do + expect(serialized).to include(select_fields: resource.extended_data["select_fields"]) + end + + it "includes the boolean fields" do + expect(serialized).to include(boolean_fields: resource.extended_data["boolean_fields"]) + end + + it "includes the text fields" do + expect(serialized).to include(text_fields: resource.extended_data["text_fields"]) + end + context "when users are blocked" do let(:resource) { create(:user, :blocked, extended_data: registration_metadata, blocked_at:) } let(:blocked_at) { Time.zone.now } diff --git a/spec/system/account_spec.rb b/spec/system/account_spec.rb index 5c66f68..e3a2370 100644 --- a/spec/system/account_spec.rb +++ b/spec/system/account_spec.rb @@ -12,22 +12,22 @@ let(:organization) { create(:organization, extra_user_fields:) } let(:user) { create(:user, :confirmed, organization:, password:) } let(:password) { "dqCFgjfDbC7dPbrv" } - # rubocop:disable Style/TrailingCommaInHashLiteral + let(:extra_user_fields) do { "enabled" => true, "date_of_birth" => date_of_birth, "postal_code" => postal_code, "gender" => gender, + "select_fields" => select_fields, + "boolean_fields" => boolean_fields, + "text_fields" => text_fields, + "age_range" => age_range, "country" => country, "phone_number" => phone_number, - "location" => location, - # Block ExtraUserFields ExtraUserFields - - # EndBlock + "location" => location } end - # rubocop:enable Style/TrailingCommaInHashLiteral let(:date_of_birth) do { "enabled" => true } @@ -45,6 +45,10 @@ { "enabled" => true } end + let(:age_range) do + { "enabled" => true } + end + let(:phone_number) do { "enabled" => true, "pattern" => phone_number_pattern, "placeholder" => nil } end @@ -54,11 +58,26 @@ { "enabled" => true } end - # Block ExtraUserFields RspecVar + let(:select_fields) do + ["participant_type"] + end + + let(:boolean_fields) do + ["ngo"] + end + + let(:text_fields) do + ["motto"] + end - # EndBlock + let(:enabled_text_fields) do + { + motto: false + } + end before do + allow(Decidim::ExtraUserFields).to receive(:text_fields).and_return(enabled_text_fields) switch_to_host(organization.host) login_as user, scope: :user end @@ -80,10 +99,25 @@ visit decidim.account_path end - it_behaves_like "accessible page" + # TODO: Uncomment when Decidim fixes the bug in upload_modal.js + # There's an extra comma in the img tag (`