<%== t(".callout.help") %>
-<%= t(".description") %>
- <%= form.check_box :country, label: t(".label") %> + <%= form.check_box :country, label: t(".label"), help_text: t(".description") %><%= t(".description") %>
- <%= form.check_box :date_of_birth, label: t(".label") %> + <%= form.check_box :date_of_birth, label: t(".label"), help_text: t(".description") %><%= t(".description") %>
- <%= form.check_box :gender, label: t(".label") %> + <%= form.check_box :gender, label: t(".label"), help_text: t(".description") %><%= t(".description") %>
- <%= form.check_box :location, label: t(".label") %> + <%= form.check_box :location, label: t(".label"), help_text: t(".description") %><%= t(".description") %>
- <%= form.check_box :phone_number, label: t(".label") %> + <%= form.check_box :phone_number, label: t(".label"), help_text: t(".description"), data: { toggle: "phone_fields" } %> +<%= t(".description") %>
- <%= form.check_box :postal_code, label: t(".label") %> + <%= form.check_box :postal_code, label: t(".label"), help_text: t(".description") %>^(\+34|0034|34)?[
+ -]*[6-9][ -]*([0-9][ -]*){8}$ per validar aquest format de
+ telèfono +34999111222. Podeu revisar i comprovar l'expressió regular
+ aquí.
+ placeholder: Placeholder pel número de telèfon
+ postal_code:
+ description: Aquest camp és un camp de text. Si está activat, l'usuari
+ haurà d'introduir un codi postal.
+ label: Habilitar camp de codi postal
+ form:
+ callout:
+ help: Activa la funcionalitat de camps d'usuari addicionals personalitzats
+ per poder gestionar-los al vostre formulari de registre. Fins i tot
+ si l'opció està marcada, el formulari de registre només s'actualitzarà
+ si hi ha almenys un camp activat
+ extra_user_fields:
+ extra_user_fields_enabled: Activa els camps d'usuari addicionals
+ section: Camps addicionals disponibles per al formulari d'inscripció
+ global:
+ title: Activar / desactivar la funcionalitat
+ index:
+ save: Desa la configuració
+ title: Gestiona camps d'usuari addicionals
+ update:
+ failure: S'ha produït un error en l'actualització
+ success: Camps d'usuari addicionals actualitzats correctament a l'organització
genders:
female: Dona
male: Home
other: Altre
+ registration_form:
+ signup:
+ legend: Més informació
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 69912b0..d592c05 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -28,35 +28,40 @@ en:
extra_user_fields:
fields:
country:
- description: This field is a list of countries. User will be able to
- choose a country
+ description: This field is a list of countries. If checked, user will
+ have to choose a country
label: Enable country field
date_of_birth:
- description: This field is a Date field. User will be able to register
- a birth date by using a Date picker
+ description: This field is a Date field. If checked, user will have
+ to register a birth date by using a Date picker
label: Enable date of birth field
gender:
- description: This field is a list of genders. User will be able to choose
- a gender
+ description: This field is a list of genders. If checked, user will
+ have to choose a gender
label: Enable gender field
location:
- description: This field is a String field. User will be able to fill
- in a location
+ description: This field is a String field. If checked, user will have
+ to fill in a location
label: Enable location field
phone_number:
- description: This field is a String field. User will be able to fill
- in a phone number
+ description: This field is a telephone field. If checked, user will
+ have to fill in a phone number
label: Enable phone number field
+ pattern: Phone numbers validation pattern (regexp)
+ pattern_help_html: Copy this regular expression ^(\+34|0034|34)?[
+ -]*[6-9][ -]*([0-9][ -]*){8}$ to validate this phone format
+ +34999111222. You can review and check the regular expression here.
+ placeholder: Phone number placeholder
postal_code:
- description: This field is a String field. User will be able to fill
- in a postal code
+ description: This field is a String field. If checked, user will have
+ to fill in a postal code
label: Enable postal code field
form:
callout:
help: Enable custom extra user fields functionality to be able to manage
extra fields in your signup form. Even if option is checked, signup
- form will be updated only if there is at least one extra field
- enabled
+ form will be updated only if there is at least one extra field enabled
extra_user_fields:
extra_user_fields_enabled: Enable extra user fields
section: Available extra fields for signup form
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 355383f..889530b 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -10,6 +10,14 @@ es:
phone_number: Teléfono
postal_code: Código postal
decidim:
+ admin:
+ actions:
+ export: Exportar
+ exports:
+ export_as: Exportar como %{export_format}
+ extra_user_fields:
+ menu:
+ title: Administrar campos de usuario adicionales
components:
extra_user_fields:
name: ExtraUserFields
@@ -17,7 +25,60 @@ es:
admin:
exports:
users: Participantes
+ extra_user_fields:
+ fields:
+ country:
+ description: Este campo es una lista de países. Si está marcado, el
+ usuario tendrá que elegir un país.
+ label: Habilitar campo de país
+ date_of_birth:
+ description: Este campo es un campo de fecha. Si está marcado, el usuario
+ deberá registrar una fecha de nacimiento mediante un selector de fecha.
+ label: Habilitar campo de fecha de nacimiento
+ gender:
+ description: Este campo es una lista de géneros. Si está marcado, el
+ usuario tendrá que elegir un género.
+ label: Habilitar campo de género
+ location:
+ description: Este campo es un campo de texto. Si está marcado, el usuario
+ deberá completar una ubicación.
+ label: Habilitar campo de ubicación
+ phone_number:
+ description: Este campo es un campo telefónico. Si está marcado, el
+ usuario deberá ingresar un número de teléfono.
+ label: Habilitar campo de número de teléfono
+ pattern: Patrón de validación de números de teléfono (regexp)
+ pattern_help_html: Copia esta expresión regular ^(\+34|0034|34)?[
+ -]*[6-9][ -]*([0-9][ -]*){8}$ para validar este formato de
+ teléfono +34999111222. Puedes revisar y editar la expresión regular
+ aquí.
+ placeholder: Placeholder para el número de teléfono
+ postal_code:
+ description: este campo es un campo de texto. Si está marcado, el usuario
+ deberá ingresar un código postal.
+ label: Habilitar campo de código postal
+ form:
+ callout:
+ help: Activa la funcionalidad de campos de usuario adicionales personalizados
+ para poder gestionarlos en su formulario de registro. Incluso si la
+ opción está marcada, el formulario de registro sólo se actualizará
+ si hay al menos un campo activado
+ extra_user_fields:
+ extra_user_fields_enabled: Activa los campos de usuario adicionales
+ section: Campos adicionales disponibles para el formulario de inscripción
+ global:
+ title: Activar / desactivar la funcionalidad
+ index:
+ save: Guarda la configuración
+ title: Gestiona campos de usuario adicionales
+ update:
+ failure: Se ha producido un error en la actualización
+ success: Campos de usuario adicionales actualizados correctamente en la
+ organización
genders:
female: Mujer
male: Hombre
other: Otro
+ registration_form:
+ signup:
+ legend: Más información
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 1c50ade..a82b997 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -47,6 +47,12 @@ fr:
description: Ce champ est un champ de numéro de téléphone. L'utilisateur
pourra choisir un numéro.
label: Activer le champ numéro de téléphone
+ pattern: Motif de validation des numéros de téléphone (regex)
+ pattern_help_html: Copiez cette expression régulière ^(\+34|0034|34)?[
+ -]*[6-9][ -]*([0-9][ -]*){8}$ pour valider ce format de téléphone
+ +34999111222. Vous pouvez consulter et vérifier l'expression régulière
+ ici.
+ placeholder: Placeholder pour le numéro de téléphone
postal_code:
description: Ce champ est un champ code postal. L'utilisateur pourra
choisir un code postal.
diff --git a/lib/decidim/extra_user_fields/admin_engine.rb b/lib/decidim/extra_user_fields/admin_engine.rb
index 60d8516..0c058a3 100644
--- a/lib/decidim/extra_user_fields/admin_engine.rb
+++ b/lib/decidim/extra_user_fields/admin_engine.rb
@@ -41,7 +41,8 @@ class AdminEngine < ::Rails::Engine
menu.add_item :extra_user_fields,
t("decidim.admin.extra_user_fields.menu.title"),
decidim_extra_user_fields.root_path,
- position: 11
+ position: 11,
+ icon_name: "list-check"
end
end
diff --git a/lib/decidim/extra_user_fields/form_builder_methods.rb b/lib/decidim/extra_user_fields/form_builder_methods.rb
index 059eaf9..a1345a3 100644
--- a/lib/decidim/extra_user_fields/form_builder_methods.rb
+++ b/lib/decidim/extra_user_fields/form_builder_methods.rb
@@ -9,7 +9,7 @@ def custom_country_select(name, options = {})
label_text = label_for(name) if label_text.blank?
template = ""
- template += label(name, label_text + required_for_attribute(name)) if options.fetch(:label, true)
+ template += (label_text + required_for_attribute(name)) if options.fetch(:label, true)
template += country_select(name)
template.html_safe
end
diff --git a/lib/decidim/extra_user_fields/test/factories.rb b/lib/decidim/extra_user_fields/test/factories.rb
index 9657070..5fae274 100644
--- a/lib/decidim/extra_user_fields/test/factories.rb
+++ b/lib/decidim/extra_user_fields/test/factories.rb
@@ -6,7 +6,7 @@
factory :extra_user_fields_component, parent: :component do
name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :extra_user_fields).i18n_name }
manifest_name { :extra_user_fields }
- participatory_space { create(:participatory_process, :with_steps) }
+ participatory_space factory: [:participatory_process, :with_steps]
end
# Add engine factories here
diff --git a/lib/decidim/extra_user_fields/version.rb b/lib/decidim/extra_user_fields/version.rb
index e6bada4..f28f7fe 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.27.2"
+ "0.28.0"
end
def self.decidim_version
- [">= 0.27.0", "< 0.28"].freeze
+ [">= 0.28"].freeze
end
end
end
diff --git a/spec/commands/decidim/create_omniauth_registration_spec.rb b/spec/commands/decidim/create_omniauth_registration_spec.rb
index 201c670..3a44850 100644
--- a/spec/commands/decidim/create_omniauth_registration_spec.rb
+++ b/spec/commands/decidim/create_omniauth_registration_spec.rb
@@ -14,18 +14,18 @@ module Comments
let(:verified_email) { email }
let(:country) { "Argentina" }
let(:date_of_birth) { "01/01/2000" }
- let(:gender) { "Other" }
+ let(:gender) { "other" }
let(:location) { "Paris" }
let(:phone_number) { "0123456789" }
let(:postal_code) { "75001" }
let(:extended_data) do
{
- country: country,
- date_of_birth: date_of_birth,
- gender: gender,
- location: location,
- phone_number: phone_number,
- postal_code: postal_code
+ country:,
+ date_of_birth:,
+ gender:,
+ location:,
+ phone_number:,
+ postal_code:
}
end
@@ -119,7 +119,7 @@ module Comments
end
it "notifies about registration with oauth data" do
- user = create(:user, email: email, organization: organization)
+ user = create(:user, email:, organization:)
identity = Decidim::Identity.new(id: 1234)
allow(command).to receive(:create_identity).and_return(identity)
@@ -129,9 +129,9 @@ module Comments
"decidim.user.omniauth_registration",
user_id: user.id,
identity_id: 1234,
- provider: provider,
- uid: uid,
- email: email,
+ provider:,
+ uid:,
+ email:,
name: "Facebook User",
nickname: "facebook_user",
avatar_url: "http://www.example.com/foo.jpg",
@@ -145,17 +145,17 @@ module Comments
let(:verified_email) { email }
it "links a previously existing user" do
- user = create(:user, email: email, organization: organization)
+ user = create(:user, email:, organization:)
expect { command.call }.not_to change(User, :count)
expect(user.identities.length).to eq(1)
end
it "confirms a previously existing user" do
- create(:user, email: email, organization: organization)
+ create(:user, email:, organization:)
expect { command.call }.not_to change(User, :count)
- user = User.find_by(email: email)
+ user = User.find_by(email:)
expect(user).to be_confirmed
end
end
@@ -164,17 +164,17 @@ module Comments
let(:verified_email) { nil }
it "doesn't link a previously existing user" do
- user = create(:user, email: email, organization: organization)
+ user = create(:user, email:, organization:)
expect { command.call }.to broadcast(:error)
expect(user.identities.length).to eq(0)
end
it "doesn't confirm a previously existing user" do
- create(:user, email: email, organization: organization)
+ create(:user, email:, organization:)
expect { command.call }.to broadcast(:error)
- user = User.find_by(email: email)
+ user = User.find_by(email:)
expect(user).not_to be_confirmed
end
end
@@ -200,8 +200,8 @@ module Comments
context "when a user exists with that identity" do
before do
- user = create(:user, email: email, organization: organization)
- create(:identity, user: user, provider: provider, uid: uid)
+ user = create(:user, email:, organization:)
+ create(:identity, user:, provider:, uid:)
end
it "broadcasts ok" do
@@ -212,7 +212,7 @@ module Comments
it "confirms the user" do
command.call
- user = User.find_by(email: email)
+ user = User.find_by(email:)
expect(user).to be_confirmed
end
end
@@ -223,7 +223,7 @@ module Comments
it "doesn't confirm the user" do
command.call
- user = User.find_by(email: email)
+ user = User.find_by(email:)
expect(user).not_to be_confirmed
end
end
diff --git a/spec/commands/decidim/create_registration_spec.rb b/spec/commands/decidim/create_registration_spec.rb
index cb2f4a3..6760b25 100644
--- a/spec/commands/decidim/create_registration_spec.rb
+++ b/spec/commands/decidim/create_registration_spec.rb
@@ -12,24 +12,23 @@ module Comments
let(:nickname) { "nickname" }
let(:email) { "user@example.org" }
let(:password) { "Y1fERVzL2F" }
- let(:password_confirmation) { password }
let(:tos_agreement) { "1" }
let(:newsletter) { "1" }
let(:current_locale) { "es" }
let(:country) { "Argentina" }
let(:date_of_birth) { "01/01/2000" }
- let(:gender) { "Other" }
+ let(:gender) { "other" }
let(:location) { "Paris" }
let(:phone_number) { "0123456789" }
let(:postal_code) { "75001" }
let(:extended_data) do
{
- country: country,
- date_of_birth: date_of_birth,
- gender: gender,
- location: location,
- phone_number: phone_number,
- postal_code: postal_code
+ country:,
+ date_of_birth:,
+ gender:,
+ location:,
+ phone_number:,
+ postal_code:
}
end
@@ -40,7 +39,6 @@ module Comments
"nickname" => nickname,
"email" => email,
"password" => password,
- "password_confirmation" => password_confirmation,
"tos_agreement" => tos_agreement,
"newsletter_at" => newsletter,
"country" => country,
@@ -55,7 +53,7 @@ module Comments
let(:form) do
RegistrationForm.from_params(
form_params,
- current_locale: current_locale
+ current_locale:
).with_context(
current_organization: organization
)
@@ -78,7 +76,7 @@ module Comments
end
context "when the user was already invited" do
- let(:user) { build(:user, email: email, organization: organization) }
+ let(:user) { build(:user, email:, organization:) }
before do
user.invite!
@@ -108,20 +106,19 @@ module Comments
nickname: form.nickname,
email: form.email,
password: form.password,
- password_confirmation: form.password_confirmation,
password_updated_at: an_instance_of(ActiveSupport::TimeWithZone),
tos_agreement: form.tos_agreement,
newsletter_notifications_at: form.newsletter_at,
- organization: organization,
+ organization:,
accepted_tos_version: organization.tos_version,
locale: form.current_locale,
extended_data: {
- country: country,
+ country:,
date_of_birth: Date.parse(date_of_birth),
- gender: gender,
- location: location,
- phone_number: phone_number,
- postal_code: postal_code
+ gender:,
+ location:,
+ phone_number:,
+ postal_code:
}
).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 639a183..1acb5ba 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
@@ -7,7 +7,7 @@ module ExtraUserFields
module Admin
describe UpdateExtraUserFields do
let(:organization) { create(:organization, extra_user_fields: {}) }
- let(:user) { create :user, :admin, :confirmed, organization: organization }
+ let(:user) { create(:user, :admin, :confirmed, organization:) }
let(:extra_user_fields_enabled) { true }
let(:postal_code) { true }
@@ -15,6 +15,8 @@ module Admin
let(:gender) { true }
let(:date_of_birth) { true }
let(:phone_number) { true }
+ let(:phone_number_pattern) { "^(\\+34)?[0-9 ]{9,12}$" }
+ let(:phone_number_placeholder) { "+34999888777" }
let(:location) { true }
# Block ExtraUserFields RspecVar
@@ -29,6 +31,8 @@ module Admin
"gender" => gender,
"date_of_birth" => date_of_birth,
"phone_number" => phone_number,
+ "phone_number_pattern" => phone_number_pattern,
+ "phone_number_placeholder" => phone_number_placeholder,
"location" => location,
# Block ExtraUserFields ExtraUserFields
@@ -80,7 +84,7 @@ module Admin
expect(extra_user_fields).to include("date_of_birth" => { "enabled" => true })
expect(extra_user_fields).to include("gender" => { "enabled" => true })
expect(extra_user_fields).to include("country" => { "enabled" => true })
- expect(extra_user_fields).to include("phone_number" => { "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 })
# Block ExtraUserFields InclusionSpec
diff --git a/spec/factories.rb b/spec/factories.rb
index 37b735f..3fda653 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -5,6 +5,7 @@
FactoryBot.modify do
factory :organization, class: "Decidim::Organization" do
transient do
+ skip_injection { false }
create_static_pages { true }
end
@@ -22,7 +23,6 @@
default_locale { Decidim.default_locale }
available_locales { Decidim.available_locales }
users_registration_mode { :enabled }
- official_img_header { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
official_img_footer { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
official_url { Faker::Internet.url }
highlighted_content_banner_enabled { false }
@@ -31,7 +31,7 @@
user_groups_enabled { true }
send_welcome_notification { true }
comments_max_length { 1000 }
- admin_terms_of_use_body { Decidim::Faker::Localized.wrapped("", "
") { generate_localized_title } } + admin_terms_of_service_body { Decidim::Faker::Localized.wrapped("", "
") { 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"] } @@ -51,6 +51,25 @@ "enabled" => true } end + content_security_policy do + { + "default-src" => "localhost:* #{host}:*", + "script-src" => "localhost:* #{host}:*", + "style-src" => "localhost:* #{host}:*", + "img-src" => "localhost:* #{host}:*", + "font-src" => "localhost:* #{host}:*", + "connect-src" => "localhost:* #{host}:*", + "frame-src" => "localhost:* #{host}:* www.example.org", + "media-src" => "localhost:* #{host}:*" + } + end + colors do + { + primary: "#e02d2d", + secondary: "#155abf", + tertiary: "#ebc34b" + } + end trait :extra_user_fields_disabled do extra_user_fields do @@ -66,8 +85,8 @@ after(:create) do |organization, evaluator| if evaluator.create_static_pages - tos_page = Decidim::StaticPage.find_by(slug: "terms-and-conditions", organization: organization) - create(:static_page, :tos, organization: organization) if tos_page.nil? + tos_page = Decidim::StaticPage.find_by(slug: "terms-of-service", organization:) + create(:static_page, :tos, organization:, skip_injection: evaluator.skip_injection) if tos_page.nil? end end end diff --git a/spec/forms/decidim/account_form_spec.rb b/spec/forms/decidim/account_form_spec.rb index 542a185..1b367c0 100644 --- a/spec/forms/decidim/account_form_spec.rb +++ b/spec/forms/decidim/account_form_spec.rb @@ -6,43 +6,56 @@ module Decidim describe AccountForm do subject do described_class.new( - name: name, - email: email, - nickname: nickname, - password: password, - password_confirmation: password_confirmation, - avatar: avatar, - remove_avatar: remove_avatar, - personal_url: personal_url, - about: about, + name:, + email:, + nickname:, + password:, + old_password:, + avatar:, + remove_avatar:, + personal_url:, + about:, locale: "es", - country: country, - postal_code: postal_code, - date_of_birth: date_of_birth, - gender: gender, - phone_number: phone_number, - location: location + country:, + postal_code:, + date_of_birth:, + gender:, + phone_number:, + location: ).with_context( current_organization: organization, current_user: user ) end - let(:user) { create(:user) } - let(:organization) { user.organization } + let(:user) { create(:user, password: user_password, organization:) } + let(:organization) { create(:organization, extra_user_fields:) } + let(:extra_user_fields) do + { + "enabled" => true, + "country" => { "enabled" => true }, + "postal_code" => { "enabled" => true }, + "date_of_birth" => { "enabled" => true }, + "gender" => { "enabled" => true }, + "phone_number" => { "enabled" => true, "pattern" => phone_number_pattern, "placeholder" => nil }, + "location" => { "enabled" => true } + } + end + let(:phone_number_pattern) { "^(\\+34)?[0-9 ]{9,12}$" } + let(:user_password) { "decidim1234567890" } + let(:old_password) { user_password } let(:name) { "Lord of the Foo" } let(:email) { "depths@ofthe.bar" } let(:nickname) { "foo_bar" } let(:password) { "Rf9kWTqQfyqkwseH" } - let(:password_confirmation) { password } let(:avatar) { upload_test_file(Decidim::Dev.test_file("avatar.jpg", "image/jpeg")) } let(:remove_avatar) { false } let(:personal_url) { "http://example.org" } let(:about) { "This is a description about me" } let(:country) { "Argentina" } let(:date_of_birth) { "01/01/2000" } - let(:gender) { "Other" } + let(:gender) { "other" } let(:location) { "Paris" } let(:phone_number) { "0123456789" } let(:postal_code) { "75001" } @@ -61,6 +74,14 @@ module Decidim end end + context "with invalid phone number format" do + let(:phone_number_pattern) { "^(\\+34)?[0-1 ]{9,12}$" } + + it "is invalid" do + expect(subject).not_to be_valid + end + end + describe "name" do context "with an empty name" do let(:name) { "" } @@ -88,9 +109,9 @@ module Decidim end end - context "when it's already in use in the same organization" do + context "when it is already in use in the same organization" do context "and belongs to a user" do - let!(:existing_user) { create(:user, email: email, organization: organization) } + let!(:existing_user) { create(:user, email:, organization:) } it "is invalid" do expect(subject).not_to be_valid @@ -98,7 +119,7 @@ module Decidim end context "and belongs to a group" do - let!(:existing_group) { create(:user_group, email: email, organization: organization) } + let!(:existing_group) { create(:user_group, email:, organization:) } it "is invalid" do expect(subject).not_to be_valid @@ -106,8 +127,8 @@ module Decidim end end - context "when it's already in use in another organization" do - let!(:existing_user) { create(:user, email: email) } + context "when it is already in use in another organization" do + let!(:existing_user) { create(:user, email:) } it "is valid" do expect(subject).to be_valid @@ -124,9 +145,9 @@ module Decidim end end - context "when it's already in use in the same organization" do + context "when it is already in use in the same organization" do context "and belongs to a user" do - let!(:existing_user) { create(:user, nickname: nickname, organization: organization) } + let!(:existing_user) { create(:user, nickname:, organization:) } it "is invalid" do expect(subject).not_to be_valid @@ -134,7 +155,7 @@ module Decidim end context "and belongs to a group" do - let!(:existing_group) { create(:user_group, nickname: nickname, organization: organization) } + let!(:existing_group) { create(:user_group, nickname:, organization:) } it "is invalid" do expect(subject).not_to be_valid @@ -142,8 +163,8 @@ module Decidim end end - context "when it's already in use in another organization" do - let!(:existing_user) { create(:user, nickname: nickname) } + context "when it is already in use in another organization" do + let!(:existing_user) { create(:user, nickname:) } it "is valid" do expect(subject).to be_valid @@ -163,12 +184,47 @@ module Decidim context "when the password is weak" do let(:password) { "aaaabbbbcccc" } - it { is_expected.to be_invalid } + it { is_expected.not_to be_valid } + end + end + + describe "validate_old_password" do + context "when email changed" do + let(:password) { "" } + let(:email) { "foo@example.org" } + + context "with correct old_password" do + it "is valid" do + expect(subject).to be_valid + end + end + + context "with incorrect old_password" do + let(:old_password) { "foobar1234567890" } + + it { is_expected.not_to be_valid } + end + end + + context "when password present" do + let(:email) { user.email } + + context "with correct old_password" do + it "is valid" do + expect(subject).to be_valid + end + end + + context "with incorrect old_password" do + let(:old_password) { "foobar1234567890" } + + it { is_expected.not_to be_valid } + end end end describe "personal_url" do - context "when it doesn't start with http" do + context "when it does not start with http" do let(:personal_url) { "example.org" } it "adds it" do @@ -176,7 +232,7 @@ module Decidim end end - context "when it's not a valid URL" do + context "when it is not a valid URL" do let(:personal_url) { "foobar, aa" } it "is invalid" do diff --git a/spec/forms/decidim/admin/extra_user_fields_form_spec.rb b/spec/forms/decidim/admin/extra_user_fields_form_spec.rb index 688dd4f..21890cb 100644 --- a/spec/forms/decidim/admin/extra_user_fields_form_spec.rb +++ b/spec/forms/decidim/admin/extra_user_fields_form_spec.rb @@ -19,7 +19,7 @@ module Admin let(:attributes) do { - extra_user_fields: extra_user_fields + extra_user_fields: } end diff --git a/spec/forms/decidim/omniauth_registration_form_spec.rb b/spec/forms/decidim/omniauth_registration_form_spec.rb index dd2dce9..3b25b82 100644 --- a/spec/forms/decidim/omniauth_registration_form_spec.rb +++ b/spec/forms/decidim/omniauth_registration_form_spec.rb @@ -20,26 +20,26 @@ module Decidim let(:oauth_signature) { OmniauthRegistrationForm.create_signature(provider, uid) } let(:country) { "Argentina" } let(:date_of_birth) { "01/01/2000" } - let(:gender) { "Other" } + let(:gender) { "other" } let(:location) { "Paris" } let(:phone_number) { "0123456789" } let(:postal_code) { "75001" } let(:attributes) do { - email: email, + email:, email_verified: true, - name: name, - provider: provider, - uid: uid, - oauth_signature: oauth_signature, + name:, + provider:, + uid:, + oauth_signature:, avatar_url: "http://www.example.org/foo.jpg", - country: country, - postal_code: postal_code, - date_of_birth: date_of_birth, - gender: gender, - phone_number: phone_number, - location: location + country:, + postal_code:, + date_of_birth:, + gender:, + phone_number:, + location: } end diff --git a/spec/forms/decidim/registration_form_spec.rb b/spec/forms/decidim/registration_form_spec.rb index a1f79b6..7d46383 100644 --- a/spec/forms/decidim/registration_form_spec.rb +++ b/spec/forms/decidim/registration_form_spec.rb @@ -4,7 +4,9 @@ module Decidim describe RegistrationForm do - subject do + subject { form } + + let(:form) do described_class.from_params( attributes ).with_context( @@ -12,34 +14,44 @@ module Decidim ) end - let(:organization) { create(:organization) } + let(:organization) { create(:organization, extra_user_fields:) } + let(:extra_user_fields) do + { + "enabled" => true, + "country" => { "enabled" => true }, + "postal_code" => { "enabled" => true }, + "date_of_birth" => { "enabled" => true }, + "gender" => { "enabled" => true }, + "phone_number" => { "enabled" => true, "pattern" => phone_number_pattern, "placeholder" => nil }, + "location" => { "enabled" => true } + } + end + let(:phone_number_pattern) { "^(\\+34)?[0-9 ]{9,12}$" } let(:name) { "User" } - let(:nickname) { "justme" } let(:email) { "user@example.org" } let(:password) { "S4CGQ9AM4ttJdPKS" } - let(:password_confirmation) { password } let(:tos_agreement) { "1" } + let(:newsletter) { "1" } let(:country) { "Argentina" } let(:date_of_birth) { "01/01/2000" } - let(:gender) { "Other" } + let(:gender) { "other" } let(:location) { "Paris" } let(:phone_number) { "0123456789" } let(:postal_code) { "75001" } let(:attributes) do { - name: name, - nickname: nickname, - email: email, - password: password, - password_confirmation: password_confirmation, - tos_agreement: tos_agreement, - country: country, - postal_code: postal_code, - date_of_birth: date_of_birth, - gender: gender, - phone_number: phone_number, - location: location + name:, + email:, + password:, + tos_agreement:, + newsletter:, + country:, + postal_code:, + date_of_birth:, + gender:, + phone_number:, + location: } end @@ -56,113 +68,133 @@ module Decidim context "when the email is a disposable account" do let(:email) { "user@mailbox92.biz" } - it { is_expected.to be_invalid } + it { is_expected.not_to be_valid } end context "when the name is not present" do let(:name) { nil } - it { is_expected.to be_invalid } + it { is_expected.not_to be_valid } end - context "when the nickname is not present" do - let(:nickname) { nil } + context "with invalid phone number format" do + let(:phone_number_pattern) { "^(\\+34)?[0-1 ]{9,12}$" } - it { is_expected.to be_invalid } + it "is invalid" do + expect(subject).not_to be_valid + end end context "when the email is not present" do let(:email) { nil } - it { is_expected.to be_invalid } + it { is_expected.not_to be_valid } end context "when the email already exists" do context "and a user has the email" do - let!(:user) { create(:user, organization: organization, email: email) } + let!(:user) { create(:user, organization:, email:) } - it { is_expected.to be_invalid } + it { is_expected.not_to be_valid } context "and is pending to accept the invitation" do - let!(:user) { create(:user, organization: organization, email: email, invitation_token: "foo", invitation_accepted_at: nil) } + let!(:user) { create(:user, organization:, email:, invitation_token: "foo", invitation_accepted_at: nil) } - it { is_expected.to be_invalid } + 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: organization, email: email) } + let!(:user_group) { create(:user_group, organization:, email:) } - it { is_expected.to be_invalid } + it { is_expected.not_to be_valid } end end - context "when the nickname already exists" do - context "and a user has the nickname" do - let!(:user) { create(:user, organization: organization, nickname: nickname.upcase) } + context "when the name is an email" do + let(:name) { "test@example.org" } - it { is_expected.to be_invalid } + it { is_expected.not_to be_valid } + end - context "and is pending to accept the invitation" do - let!(:user) { create(:user, organization: organization, nickname: nickname, invitation_token: "foo", invitation_accepted_at: nil) } + context "when the password is not present" do + let(:password) { nil } - it { is_expected.to be_valid } - end - end + it { is_expected.not_to be_valid } + end - context "and a user_group has the nickname" do - let!(:user_group) { create(:user_group, organization: organization, nickname: nickname) } + context "when the password is weak" do + let(:password) { "aaaabbbbcccc" } - it { is_expected.to be_invalid } - end + it { is_expected.not_to be_valid } end - context "when the nickname is too long" do - let(:nickname) { "verylongnicknamethatcreatesanerror" } + context "when the tos_agreement is not accepted" do + let(:tos_agreement) { "0" } - it { is_expected.to be_invalid } + it { is_expected.not_to be_valid } end - context "when the name is an email" do - let(:name) { "test@example.org" } + describe "#newsletter_at" do + subject { form.newsletter_at } - it { is_expected.to be_invalid } - end + let(:current_time) { Time.current } + + it { is_expected.to be_between(current_time - 1.minute, current_time + 1.minute) } - context "when the nickname has spaces" do - let(:nickname) { "test example" } + context "when newsletter was not ordered" do + let(:newsletter) { "0" } - it { is_expected.to be_invalid } + it { is_expected.to be_nil } + end end - context "when the password is not present" do - let(:password) { nil } + describe "nickname" do + let(:name) { "justme" } - it { is_expected.to be_invalid } - end + context "when the nickname already exists" do + context "and a user has the nickname" do + let!(:another_user) { create(:user, organization:, nickname: name.upcase) } - context "when the password is weak" do - let(:password) { "aaaabbbbcccc" } + it { is_expected.to be_valid } - it { is_expected.to be_invalid } - end + it "adds a suffix in the nickname" do + expect(subject.nickname).to eq("justme_2") + end - context "when the password confirmation is not present" do - let(:password_confirmation) { nil } + context "and is pending to accept the invitation" do + let!(:another_user) { create(:user, organization:, nickname: name, invitation_token: "foo", invitation_accepted_at: nil) } - it { is_expected.to be_invalid } - end + it { is_expected.to be_valid } + end + end - context "when the password confirmation is different from password" do - let(:password_confirmation) { "invalid" } + context "and a user_group has the nickname" do + let!(:user_group) { create(:user_group, organization:, nickname: name) } - it { is_expected.to be_invalid } - end + it { is_expected.to be_valid } + end + end - context "when the tos_agreement is not accepted" do - let(:tos_agreement) { "0" } + context "when the nickname is too long" do + let(:name) { "verylongnicknamethatcreatesanerror" } + + it { is_expected.to be_valid } + + it "truncates the nickname" do + expect(subject.nickname).to eq("verylongnicknamethat") + end + end + + context "when the name has spaces" do + let(:name) { "test example" } - it { is_expected.to be_invalid } + it { is_expected.to be_valid } + + it "replaces the space in the nickname" do + expect(subject.nickname).to eq("test_example") + end + end end end end diff --git a/spec/models/decidim/organization_spec.rb b/spec/models/decidim/organization_spec.rb index 181da15..4760cfc 100644 --- a/spec/models/decidim/organization_spec.rb +++ b/spec/models/decidim/organization_spec.rb @@ -4,7 +4,7 @@ module Decidim describe Organization do - subject(:organization) { build(:organization, extra_user_fields: extra_user_fields) } + subject(:organization) { build(:organization, extra_user_fields:) } let(:extra_user_fields) do { @@ -47,17 +47,17 @@ module Decidim describe "has an association for scopes" do subject(:organization_scopes) { organization.scopes } - let(:scopes) { create_list(:scope, 2, organization: organization) } + let(:scopes) { create_list(:scope, 2, organization:) } - it { is_expected.to contain_exactly(*scopes) } + it { is_expected.to match_array(scopes) } end describe "has an association for scope types" do subject(:organization_scopes_types) { organization.scope_types } - let(:scope_types) { create_list(:scope_type, 2, organization: organization) } + let(:scope_types) { create_list(:scope_type, 2, organization:) } - it { is_expected.to contain_exactly(*scope_types) } + it { is_expected.to match_array(scope_types) } end describe "validations" do @@ -109,7 +109,7 @@ module Decidim } end - before { organization.update!(omniauth_settings: omniauth_settings) } + before { organization.update!(omniauth_settings:) } it "returns only the enabled settings" do expect(subject[:facebook][:app_id]).to eq("overriden-app-id") diff --git a/spec/permissions/admin/permissions_spec.rb b/spec/permissions/admin/permissions_spec.rb index 2eb0285..6e29702 100644 --- a/spec/permissions/admin/permissions_spec.rb +++ b/spec/permissions/admin/permissions_spec.rb @@ -6,7 +6,7 @@ module Decidim::ExtraUserFields::Admin describe Permissions do subject { described_class.new(user, permission_action, context).permissions.allowed? } - let(:organization) { create :organization } + let(:organization) { create(:organization) } let(:context) do { current_organization: organization @@ -18,7 +18,7 @@ module Decidim::ExtraUserFields::Admin let(:permission_action) { Decidim::PermissionAction.new(**action) } context "when user is admin" do - let(:user) { create :user, :admin, organization: organization } + let(:user) { create(:user, :admin, organization:) } it { is_expected.to be_truthy } @@ -32,7 +32,7 @@ module Decidim::ExtraUserFields::Admin end context "when user is not admin" do - let(:user) { create :user, organization: organization } + let(:user) { create(:user, organization:) } context "and tries to read extra user fields" do let(:action) do diff --git a/spec/serializers/user_export_serializer_spec.rb b/spec/serializers/decidim/extra_user_fields/user_export_serializer_spec.rb similarity index 89% rename from spec/serializers/user_export_serializer_spec.rb rename to spec/serializers/decidim/extra_user_fields/user_export_serializer_spec.rb index e60c024..9eb39bd 100644 --- a/spec/serializers/user_export_serializer_spec.rb +++ b/spec/serializers/decidim/extra_user_fields/user_export_serializer_spec.rb @@ -9,12 +9,12 @@ # rubocop:disable Style/TrailingCommaInHashLiteral let(:registration_metadata) do { - gender: gender, - postal_code: postal_code, - date_of_birth: date_of_birth, - country: country, - phone_number: phone_number, - location: location, + gender:, + postal_code:, + date_of_birth:, + country:, + phone_number:, + location:, # Block ExtraUserFields ExtraUserFields # EndBlock @@ -22,7 +22,7 @@ end # rubocop:enable Style/TrailingCommaInHashLiteral - let(:gender) { "Other" } + let(:gender) { "other" } let(:postal_code) { "00000" } let(:date_of_birth) { "01/01/2000" } let(:country) { "Argentina" } diff --git a/spec/system/account_spec.rb b/spec/system/account_spec.rb index 44ca322..3033eaa 100644 --- a/spec/system/account_spec.rb +++ b/spec/system/account_spec.rb @@ -2,15 +2,15 @@ require "spec_helper" -describe "Account", type: :system do +describe "Account" do shared_examples_for "does not display extra user field" do |field, label| it "does not display field '#{field}'" do - expect(page).not_to have_content(label) + expect(page).to have_no_content(label) end end - let(:organization) { create(:organization, extra_user_fields: extra_user_fields) } - let(:user) { create(:user, :confirmed, organization: organization, password: password, password_confirmation: password) } + let(:organization) { create(:organization, extra_user_fields:) } + let(:user) { create(:user, :confirmed, organization:, password:, password_confirmation: password) } let(:password) { "dqCFgjfDbC7dPbrv" } # rubocop:disable Style/TrailingCommaInHashLiteral let(:extra_user_fields) do @@ -46,8 +46,9 @@ end let(:phone_number) do - { "enabled" => true } + { "enabled" => true, "pattern" => phone_number_pattern, "placeholder" => nil } end + let(:phone_number_pattern) { "^(\\+34)?[0-9 ]{9,12}$" } let(:location) do { "enabled" => true } @@ -68,7 +69,7 @@ end describe "updating personal data" do - it "updates the user's data" do + before do within "form.edit_user" do select "Castellano", from: :user_locale fill_in :user_name, with: "Nikola Tesla" @@ -87,13 +88,31 @@ find("*[type=submit]").click end + end + it "updates the user's data" do within_flash_messages do expect(page).to have_content("successfully") end + end + + context "with phone number pattern blank" do + let(:phone_number_pattern) { nil } + + it "updates the user's data" do + within_flash_messages do + expect(page).to have_content("successfully") + end + end + end + + context "with phone number pattern not compatible with number" do + let(:phone_number_pattern) { "^(\\+34)?[0-1 ]{9,12}$" } - within ".title-bar" do - expect(page).to have_content("Nikola Tesla") + it "does not update the user's data" do + within("label[for='user_phone_number']") do + expect(page).to have_content("There is an error in this field.") + end end end end diff --git a/spec/system/admin_manages_officializations_spec.rb b/spec/system/admin_manages_officializations_spec.rb index fefb60d..3c9f367 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", type: :system do +describe "Admin manages officializations" do include_context "with filterable context" let(:model_name) { Decidim::User.model_name } @@ -10,17 +10,21 @@ let(:organization) { create(:organization) } - let!(:admin) { create(:user, :admin, :confirmed, organization: organization) } + let!(:admin) { create(:user, :admin, :confirmed, organization:) } before do switch_to_host(organization.host) login_as admin, scope: :user visit decidim_admin.root_path - click_link "Participants" + within ".layout-nav" do + click_on "Participants" + end end it "includes export dropdown button" do - click_link "Participants" + within ".sidebar-menu" do + click_on "Participants" + end expect(page).to have_content("Export") end 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 dde7091..1c46fec 100644 --- a/spec/system/admin_manages_organization_extra_user_fields_spec.rb +++ b/spec/system/admin_manages_organization_extra_user_fields_spec.rb @@ -2,9 +2,9 @@ require "spec_helper" -describe "Admin manages organization extra user fields", type: :system do +describe "Admin manages organization extra user fields" do let(:organization) { create(:organization) } - let(:user) { create(:user, :admin, :confirmed, organization: organization) } + let(:user) { create(:user, :admin, :confirmed, organization:) } before do switch_to_host(organization.host) @@ -14,7 +14,7 @@ it "creates a new item in submenu" do visit decidim_admin.edit_organization_path - within ".secondary-nav" do + within ".sidebar-menu" do expect(page).to have_content("Manage extra user fields") end end @@ -25,17 +25,15 @@ end it "displays the form" do - within "#extra_user_fields" do + within ".item_show__wrapper" do expect(page).to have_content("Manage extra user fields") + expect(page).to have_css("#extra_user_fields") end end it "allows to enable extra user fields functionality" do - within ".extra_user_fields" do + within "#extra_user_fields" do expect(page).to have_content("Enable extra user fields") - end - - within ".extra_fields_setup" do expect(page).to have_content("Available extra fields for signup form") end end @@ -44,7 +42,7 @@ it "flashes a success message" do page.check("extra_user_fields[enabled]") - find("*[type=submit]").click + find("*[type=submit]", text: "Save configuration").click expect(page).to have_content("Extra user fields correctly updated in organization") end end diff --git a/spec/system/registration_spec.rb b/spec/system/registration_spec.rb index 250aff3..9250b93 100644 --- a/spec/system/registration_spec.rb +++ b/spec/system/registration_spec.rb @@ -4,10 +4,8 @@ def fill_registration_form fill_in :registration_user_name, with: "Nikola Tesla" - fill_in :registration_user_nickname, with: "the-greatest-genius-in-history" fill_in :registration_user_email, with: "nikola.tesla@example.org" fill_in :registration_user_password, with: "sekritpass123" - fill_in :registration_user_password_confirmation, with: "sekritpass123" page.check("registration_user_newsletter") page.check("registration_user_tos_agreement") end @@ -24,7 +22,7 @@ def fill_extra_user_fields # EndBlock end -describe "Extra user fields", type: :system do +describe "Extra user fields" do shared_examples_for "mandatory extra user fields" do |field| it "displays #{field} as mandatory" do within "label[for='registration_user_#{field}']" do @@ -33,8 +31,8 @@ def fill_extra_user_fields end end - let(:organization) { create(:organization, extra_user_fields: extra_user_fields) } - let!(:terms_and_conditions_page) { Decidim::StaticPage.find_by(slug: "terms-and-conditions", organization: organization) } + 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 { @@ -68,8 +66,9 @@ def fill_extra_user_fields end let(:phone_number) do - { "enabled" => true } + { "enabled" => true, "pattern" => phone_number_pattern, "placeholder" => nil } end + let(:phone_number_pattern) { "^(\\+34)?[0-9 ]{9,12}$" } let(:location) do { "enabled" => true } @@ -85,7 +84,7 @@ def fill_extra_user_fields end it "contains extra user fields" do - within ".card__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("Country") @@ -109,6 +108,39 @@ def fill_extra_user_fields expect(page).to have_content("message with a confirmation link has been sent") end + context "with phone number pattern blank" do + let(:phone_number_pattern) { nil } + + it "allows to create a new account" do + fill_registration_form + fill_extra_user_fields + + within "form.new_user" do + find("*[type=submit]").click + end + + expect(page).to have_content("message with a confirmation link has been sent") + end + end + + context "with phone number pattern not compatible with number" do + let(:phone_number_pattern) { "^(\\+34)?[0-1 ]{9,12}$" } + + it "does not allow to create a new account" do + fill_registration_form + fill_extra_user_fields + + within "form.new_user" do + find("*[type=submit]").click + end + + expect(page).to have_no_content("message with a confirmation link has been sent") + within("label[for='registration_user_phone_number']") do + expect(page).to have_content("There is an error in this field.") + end + end + end + 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", "country" @@ -123,12 +155,12 @@ def fill_extra_user_fields let(:organization) { create(:organization, :extra_user_fields_disabled) } it "does not contain extra user fields" do - expect(page).not_to have_content("Date of birth") - expect(page).not_to have_content("Gender") - expect(page).not_to have_content("Country") - expect(page).not_to have_content("Postal code") - expect(page).not_to have_content("Phone Number") - expect(page).not_to have_content("Location") + expect(page).to have_no_content("Date of birth") + expect(page).to have_no_content("Gender") + 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