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

separate site setting for showing full name in emails

Browse Source
This commit is contained in:
Arpit Jalan
2014-10-22 00:44:56 +05:30
parent 83068fab94
commit 8700716fcd
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spec/mailers/user_notifications_spec.rb
View File

@ -80,7 +80,7 @@ describe UserNotifications do
let(:notification) { Fabricate(:notification, user: user) }
it 'generates a correct email' do
SiteSetting.stubs(:enable_names).returns(true)
SiteSetting.stubs(:enable_email_names).returns(true)
mail = UserNotifications.user_replied(response.user, post: response, notification: notification)
# from should include full user name
@ -121,7 +121,7 @@ describe UserNotifications do
let(:notification) { Fabricate(:notification, user: user) }
it 'generates a correct email' do
SiteSetting.stubs(:enable_names).returns(false)
SiteSetting.stubs(:enable_email_names).returns(false)
mail = UserNotifications.user_posted(response.user, post: response, notification: notification)
# from should not include full user name if "show user full names" is disabled
@ -150,7 +150,7 @@ describe UserNotifications do
let(:notification) { Fabricate(:notification, user: user) }
it 'generates a correct email' do
SiteSetting.stubs(:enable_names).returns(true)
SiteSetting.stubs(:enable_email_names).returns(true)
mail = UserNotifications.user_private_message(response.user, post: response, notification: notification)
# from should include full user name
@ -239,7 +239,7 @@ describe UserNotifications do
end
it "has a from alias" do
SiteSetting.stubs(:enable_names).returns(true)
SiteSetting.stubs(:enable_email_names).returns(true)
expects_build_with(has_entry(:from_alias, "#{user.name}"))
end