Merge branch 'rd/fix-case-sensative-email-conf-signup' into 'master'
Fix case sensitive email confirmation on signup See merge request gitlab-org/gitlab-ce!14606
This commit is contained in:
commit
fd8c56008f
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Fix case sensitive email confirmation on signup
|
||||||
|
merge_request: 14606
|
||||||
|
author: robdel12
|
||||||
|
type: fixed
|
|
@ -36,7 +36,7 @@ Devise.setup do |config|
|
||||||
# Configure which authentication keys should be case-insensitive.
|
# Configure which authentication keys should be case-insensitive.
|
||||||
# These keys will be downcased upon creating or modifying a user and when used
|
# These keys will be downcased upon creating or modifying a user and when used
|
||||||
# to authenticate or find a user. Default is :email.
|
# to authenticate or find a user. Default is :email.
|
||||||
config.case_insensitive_keys = [:email]
|
config.case_insensitive_keys = [:email, :email_confirmation]
|
||||||
|
|
||||||
# Configure which authentication keys should have whitespace stripped.
|
# Configure which authentication keys should have whitespace stripped.
|
||||||
# These keys will have whitespace before and after removed upon creating or
|
# These keys will have whitespace before and after removed upon creating or
|
||||||
|
|
|
@ -24,6 +24,24 @@ feature 'Signup' do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context "when sigining up with different cased emails" do
|
||||||
|
it "creates the user successfully" do
|
||||||
|
user = build(:user)
|
||||||
|
|
||||||
|
visit root_path
|
||||||
|
|
||||||
|
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.capitalize
|
||||||
|
fill_in 'new_user_password', with: user.password
|
||||||
|
click_button "Register"
|
||||||
|
|
||||||
|
expect(current_path).to eq dashboard_projects_path
|
||||||
|
expect(page).to have_content("Welcome! You have signed up successfully.")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
context "when not sending confirmation email" do
|
context "when not sending confirmation email" do
|
||||||
before do
|
before do
|
||||||
stub_application_setting(send_user_confirmation_email: false)
|
stub_application_setting(send_user_confirmation_email: false)
|
||||||
|
|
Loading…
Reference in New Issue