<%= t("management.users.create_user_success_html", email: @user.email) %>
+<% if @user.email.blank? %> +<%= t("management.users.autogenerated_password_html", password: @user.password) %>
+<% else %> +<%= t("management.users.create_user_success_html", email: @user.email) %>
+<% end %> <%= render 'management/user_permissions', message: t("management.document_verifications.in_census_has_following_permissions"), diff --git a/config/locales/management.en.yml b/config/locales/management.en.yml index d8aaf826c..d2524990a 100644 --- a/config/locales/management.en.yml +++ b/config/locales/management.en.yml @@ -114,6 +114,8 @@ en: create_user_info: 'We will create an account with the following data:' create_user_submit: Create user create_user_success_html: We have sent an email to the email address %{email} in order to verify that it belongs to this user. It contains a link they have to click. Then they will have to set their access password before being able to log in to the website + autogenerated_password_html: "Autogenerated password is %{password}, you can change it in the 'My account' section of the web" + email_optional_label: Email (optional) erased_notice: User account deleted. erased_by_manager: "Deleted by manager: %{manager}" erase_account_link: Delete user diff --git a/config/locales/management.es.yml b/config/locales/management.es.yml index 10543798a..5ef4eee19 100644 --- a/config/locales/management.es.yml +++ b/config/locales/management.es.yml @@ -114,6 +114,8 @@ es: create_user_info: 'Procedemos a crear un usuario con la siguiente información:' create_user_submit: Crear usuario create_user_success_html: Hemos enviado un correo electrónico a %{email} para verificar que es suya. El correo enviado contiene un link que el usuario deberá pulsar. Entonces podrá seleccionar una clave de acceso, y entrar en la web de participación. + autogenerated_password_html: "Se ha asignado la contraseña %{password} a este usuario. Puede modificarla desde el apartado 'Mi cuenta' de la web." + email_optional_label: "Email (recomendado pero opcional)" erased_notice: Cuenta de usuario borrada. erased_by_manager: "Borrada por el manager: %{manager}" erase_account_link: Borrar cuenta diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index 47d0e7f1d..dd0d71f2c 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -370,4 +370,15 @@ feature 'Emails' do end end + + context "Users without email" do + scenario "should not receive emails", :js do + user = create(:user, :verified, email_on_comment: true) + proposal = create(:proposal, author: user) + user.update(email: nil) + comment_on(proposal) + + expect { open_last_email }.to raise_error "No email has been sent!" + end + end end diff --git a/spec/features/management/managed_users_spec.rb b/spec/features/management/managed_users_spec.rb index 311b8f5cd..d35dc35e1 100644 --- a/spec/features/management/managed_users_spec.rb +++ b/spec/features/management/managed_users_spec.rb @@ -84,7 +84,7 @@ feature 'Managed User' do end end - scenario "User is created as level three from scratch" do + scenario "User is created with email as level three from scratch" do login_as_manager visit management_document_verifications_path @@ -101,6 +101,7 @@ feature 'Managed User' do click_button 'Create user' expect(page).to have_content "We have sent an email" + expect(page).to_not have_content "Autogenerated password is" user = User.last within(".account-info") do @@ -110,6 +111,33 @@ feature 'Managed User' do expect(page).to have_content "#{user.document_number}" end end + + scenario "User is created without email as level three from scratch" do + login_as_manager + + visit management_document_verifications_path + fill_in 'document_verification_document_number', with: '12345678Z' + click_button 'Check' + + expect(page).to have_content "Please introduce the email used on the account" + + click_link 'Create a new account' + + fill_in 'user_username', with: 'peppa' + fill_in 'user_email', with: '' + + click_button 'Create user' + + expect(page).to_not have_content "We have sent an email" + expect(page).to have_content "Autogenerated password is" + + user = User.last + within(".account-info") do + expect(page).to have_content "Identified as" + expect(page).to have_content "#{user.username}" + expect(page).to have_content "#{user.document_number}" + end + end end scenario "Close the currently managed user session" do diff --git a/spec/features/management/users_spec.rb b/spec/features/management/users_spec.rb index 5d08ce711..e7c43f4a9 100644 --- a/spec/features/management/users_spec.rb +++ b/spec/features/management/users_spec.rb @@ -6,8 +6,7 @@ feature 'Users' do login_as_manager end - scenario 'Create a level 3 user from scratch' do - + scenario 'Create a level 3 user with email from scratch' do visit management_document_verifications_path fill_in 'document_verification_document_number', with: '12345678Z' click_button 'Check' @@ -23,6 +22,7 @@ feature 'Users' do click_button 'Create user' expect(page).to have_content "We have sent an email" + expect(page).to_not have_content "Autogenerated password is" user = User.find_by_email('pepe@gmail.com') @@ -46,6 +46,32 @@ feature 'Users' do expect(page).to have_content "Your account has been confirmed." end + scenario 'Create a level 3 user without email from scratch' do + visit management_document_verifications_path + fill_in 'document_verification_document_number', with: '12345678Z' + click_button 'Check' + + expect(page).to have_content "Please introduce the email used on the account" + + click_link 'Create a new account' + + fill_in 'user_username', with: 'Kelly Sue' + fill_in 'user_email', with: '' + select_date '31-December-1980', from: 'user_date_of_birth' + + click_button 'Create user' + + expect(page).to_not have_content "We have sent an email" + expect(page).to have_content "Autogenerated password is" + + user = User.find_by_username('Kelly Sue') + + expect(user).to be_level_three_verified + expect(user).to be_residence_verified + expect(user).to be_confirmed + expect(user.date_of_birth).to have_content (Date.new(1980,12,31)) + end + scenario 'Delete a level 2 user account from document verification page', :js do level_2_user = create(:user, :level_two, document_number: "12345678Z") diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 283a01c96..2bf09f378 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -632,4 +632,29 @@ describe User do end + describe "email_required?" do + it "is true for regular users" do + expect(subject.email_required?).to eq(true) + expect(create(:user, :hidden).email_required?).to eq(true) + end + + it "is false for erased users" do + user = create(:user) + user.erase + user.reload + + expect(user.email_required?).to eq(false) + end + + it "is false for verified users with no email" do + user = create(:user, + username: "Lois", + email: "", + verified_at: Time.current) + + expect(user).to be_valid + expect(user.email_required?).to eq(false) + end + end + end