Merge branch 'add_email_password_confirmation' into 'master'

Add email confirmation field to registration form

Closes #3053

See merge request !7432

app/controllers/registrations_controller.rb

@@ -57,7 +57,7 @@ class RegistrationsController < Devise::RegistrationsController
   end
 
   def sign_up_params
-    params.require(:user).permit(:username, :email, :name, :password, :password_confirmation)
+    params.require(:user).permit(:username, :email, :email_confirmation, :name, :password)
   end
 
   def resource_name

app/models/user.rb

@@ -99,6 +99,7 @@ class User < ActiveRecord::Base
   #
   # Note: devise :validatable above adds validations for :email and :password
   validates :name, presence: true
+  validates_confirmation_of :email
   validates :notification_email, presence: true
   validates :notification_email, email: true, if: ->(user) { user.notification_email != user.email }
   validates :public_email, presence: true, uniqueness: true, email: true, allow_blank: true

app/views/devise/shared/_signup_box.html.haml

@@ -15,6 +15,9 @@
       .form-group
         = f.label :email
         = f.email_field :email, class: "form-control middle", required: true, title: "Please provide a valid email address."
+      %div.form-group
+        = f.label :email_confirmation
+        = f.email_field :email_confirmation, class: "form-control middle", required: true, title: "Please retype the email address."
       .form-group.append-bottom-20#password-strength
         = f.label :password
         = f.password_field :password, class: "form-control bottom", required: true, pattern: ".{#{@minimum_password_length},}", title: "Minimum length is #{@minimum_password_length} characters."

changelogs/unreleased/add_email_password_confirmation.yml

+---
+title: Add email confirmation field to registration form
+merge_request: 7432
+author: 

spec/features/signup_spec.rb

@@ -13,6 +13,7 @@ feature 'Signup', feature: true do
         fill_in 'new_user_name',                with: user.name
         fill_in 'new_user_username',            with: user.username
         fill_in 'new_user_email',               with: user.email
+        fill_in 'new_user_email_confirmation',  with: user.email
         fill_in 'new_user_password',            with: user.password
         click_button "Register"
 
@@ -32,6 +33,7 @@ feature 'Signup', feature: true do
         fill_in 'new_user_name',                with: user.name
         fill_in 'new_user_username',            with: user.username
         fill_in 'new_user_email',               with: user.email
+        fill_in 'new_user_email_confirmation',  with: user.email
         fill_in 'new_user_password',            with: user.password
         click_button "Register"
 
@@ -55,8 +57,9 @@ feature 'Signup', feature: true do
       click_button "Register"
 
       expect(current_path).to eq user_registration_path
-      expect(page).to have_content("error prohibited this user from being saved")
+      expect(page).to have_content("errors prohibited this user from being saved")
       expect(page).to have_content("Email has already been taken")
+      expect(page).to have_content("Email confirmation doesn't match")
     end
 
     it 'does not redisplay the password' do

spec/features/users_spec.rb

@@ -9,6 +9,7 @@ feature 'Users', feature: true, js: true do
     fill_in 'new_user_name',                with: 'Name Surname'
     fill_in 'new_user_username',            with: 'Great'
     fill_in 'new_user_email',               with: 'name@mail.com'
+    fill_in 'new_user_email_confirmation',  with: 'name@mail.com'
     fill_in 'new_user_password',            with: 'password1234'
     expect { click_button 'Register' }.to change { User.count }.by(1)
   end
@@ -36,6 +37,7 @@ feature 'Users', feature: true, js: true do
     fill_in 'new_user_name',                with: 'Another user name'
     fill_in 'new_user_username',            with: 'anotheruser'
     fill_in 'new_user_email',               with: user.email
+    fill_in 'new_user_email_confirmation',  with: user.email
     fill_in 'new_user_password',            with: '12341234'
     expect { click_button 'Register' }.to change { User.count }.by(0)
     expect(page).to have_text('Email has already been taken')