IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove enable_email_names setting

Browse Source
This commit is contained in:
Arpit Jalan
2015-01-13 13:31:58 +05:30
parent 3cea85e09a
commit 7771d2fb31
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spec/mailers/user_notifications_spec.rb
View File

@@ -90,7 +90,7 @@ describe UserNotifications do
let(:notification) { Fabricate(:notification, user: user) }
it 'generates a correct email' do
SiteSetting.stubs(:enable_email_names).returns(true)
SiteSetting.stubs(:enable_names).returns(true)
mail = UserNotifications.user_replied(response.user, post: response, notification: notification)
# from should include full user name
@@ -138,7 +138,7 @@ describe UserNotifications do
let(:notification) { Fabricate(:notification, user: user, data: {original_username: response_by_user.username}.to_json) }
it 'generates a correct email' do
SiteSetting.stubs(:enable_email_names).returns(false)
SiteSetting.stubs(:enable_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
@@ -170,7 +170,7 @@ describe UserNotifications do
let(:notification) { Fabricate(:notification, user: user, data: {original_username: response_by_user.username}.to_json) }
it 'generates a correct email' do
SiteSetting.stubs(:enable_email_names).returns(true)
SiteSetting.stubs(:enable_names).returns(true)
mail = UserNotifications.user_private_message(response.user, post: response, notification: notification)
# from should include username if full user name is not provided
@@ -268,7 +268,7 @@ describe UserNotifications do
end
it "has a from alias" do
SiteSetting.stubs(:enable_email_names).returns(true)
SiteSetting.stubs(:enable_names).returns(true)
expects_build_with(has_entry(:from_alias, "#{user.name}"))
end