github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-02 14:35:17 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SECURITY: Support for confirm old as well as new email accounts

Browse Source
This commit is contained in:
Robin Ward
2016-03-07 14:40:11 -05:00
parent d62689fa76
commit 5771d2aee2
47 changed files with 454 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spec/mailers/user_notifications_spec.rb
View File

@ -405,7 +405,8 @@ describe UserNotifications do
context "user locale has been set" do
%w(signup signup_after_approval authorize_email forgot_password admin_login account_created).each do |mail_type|
%w(signup signup_after_approval confirm_old_email notify_old_email confirm_new_email
forgot_password admin_login account_created).each do |mail_type|
include_examples "notification derived from template" do
SiteSetting.default_locale = "en"
let(:locale) { "fr" }
@ -418,7 +419,8 @@ describe UserNotifications do
end
context "user locale has not been set" do
%w(signup signup_after_approval authorize_email forgot_password admin_login account_created).each do |mail_type|
%w(signup signup_after_approval notify_old_email confirm_old_email confirm_new_email
forgot_password admin_login account_created).each do |mail_type|
include_examples "notification derived from template" do
SiteSetting.default_locale = "en"
let(:locale) { nil }
@ -431,7 +433,8 @@ describe UserNotifications do
end
context "user locale is an empty string" do
%w(signup signup_after_approval authorize_email forgot_password admin_login account_created).each do |mail_type|
%w(signup signup_after_approval notify_old_email confirm_new_email confirm_old_email
forgot_password admin_login account_created).each do |mail_type|
include_examples "notification derived from template" do
SiteSetting.default_locale = "en"
let(:locale) { "" }