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

FEATURE: Include "via <site_name>" in email From header

Browse Source
This commit is contained in:
Gerhard Schlager
2019-01-04 17:06:19 +01:00
parent 788719d271
commit c0a8bb9a91
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec/mailers/user_notifications_spec.rb
+5 -5
View File
@@ -247,7 +247,7 @@ describe UserNotifications do
notification_data_hash: notification.data_hash
)
# from should include full user name
expect(mail[:from].display_names).to eql(['John Doe'])
expect(mail[:from].display_names).to eql(['John Doe via Discourse'])
# subject should include category name
expect(mail.subject).to match(/India/)
@@ -350,7 +350,7 @@ describe UserNotifications do
expect(mail[:from].display_names).to_not eql(['John Doe'])
# from should include username if "show user full names" is disabled
expect(mail[:from].display_names).to eql(['john'])
expect(mail[:from].display_names).to eql(['john via Discourse'])
# subject should not include category name
expect(mail.subject).not_to match(/Uncategorized/)
@@ -397,7 +397,7 @@ describe UserNotifications do
)
# from should include username if full user name is not provided
expect(mail[:from].display_names).to eql(['john'])
expect(mail[:from].display_names).to eql(['john via Discourse'])
# subject should include "[PM]"
expect(mail.subject).to include("[PM] ")
@@ -656,13 +656,13 @@ describe UserNotifications do
it "should have user name as from_alias" do
SiteSetting.enable_names = true
SiteSetting.display_name_on_posts = true
expects_build_with(has_entry(:from_alias, "#{user.name}"))
expects_build_with(has_entry(:from_alias, "#{user.name} via Discourse"))
end
it "should not have user name as from_alias if display_name_on_posts is disabled" do
SiteSetting.enable_names = false
SiteSetting.display_name_on_posts = false
expects_build_with(has_entry(:from_alias, "walterwhite"))
expects_build_with(has_entry(:from_alias, "walterwhite via Discourse"))
end
it "should explain how to respond" do