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

FIX: surround the FROM alias with " in order to support the @ character

Browse Source
This commit is contained in:
Régis Hanol
2017-03-07 23:37:21 +01:00
parent 0c03ccb01e
commit ee9d621d9c
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spec/components/email/message_builder_spec.rb
View File

@@ -58,12 +58,12 @@ describe Email::MessageBuilder do
end
it "returns a Reply-To header with the reply key" do
expect(reply_by_email_builder.header_args['Reply-To']).to eq(SiteSetting.title + " <r+#{reply_key}@reply.myforum.com>")
expect(reply_by_email_builder.header_args['Reply-To']).to eq("\"#{SiteSetting.title}\" <r+#{reply_key}@reply.myforum.com>")
end
it "cleans up the site title" do
SiteSetting.stubs(:title).returns(">>>Obnoxious Title: Deal, With It<<<")
expect(reply_by_email_builder.header_args['Reply-To']).to eq("Obnoxious Title Deal With It <r+#{reply_key}@reply.myforum.com>")
SiteSetting.stubs(:title).returns(">>>Obnoxious Title: Deal, \"With\" It<<<")
expect(reply_by_email_builder.header_args['Reply-To']).to eq("\"Obnoxious Title Deal With It\" <r+#{reply_key}@reply.myforum.com>")
end
end
@@ -98,7 +98,7 @@ describe Email::MessageBuilder do
end
it "returns a Reply-To header with the reply key" do
expect(reply_by_email_builder.header_args['Reply-To']).to eq("Username <r+#{reply_key}@reply.myforum.com>")
expect(reply_by_email_builder.header_args['Reply-To']).to eq("\"Username\" <r+#{reply_key}@reply.myforum.com>")
end
end
@@ -243,7 +243,7 @@ describe Email::MessageBuilder do
it "title setting will be added if present" do
SiteSetting.title = "Dog Talk"
expect(build_args[:from]).to eq("Dog Talk <#{SiteSetting.notification_email}>")
expect(build_args[:from]).to eq("\"Dog Talk\" <#{SiteSetting.notification_email}>")
end
let(:finn_email) { 'finn@adventuretime.ooo' }
@@ -256,7 +256,7 @@ describe Email::MessageBuilder do
let(:aliased_from) { Email::MessageBuilder.new(to_address, from_alias: "Finn the Dog") }
it "allows us to alias the from address" do
expect(aliased_from.build_args[:from]).to eq("Finn the Dog <#{SiteSetting.notification_email}>")
expect(aliased_from.build_args[:from]).to eq("\"Finn the Dog\" <#{SiteSetting.notification_email}>")
end
let(:custom_aliased_from) { Email::MessageBuilder.new(to_address,
@@ -264,28 +264,28 @@ describe Email::MessageBuilder do
from: finn_email) }
it "allows us to alias a custom from address" do
expect(custom_aliased_from.build_args[:from]).to eq("Finn the Dog <#{finn_email}>")
expect(custom_aliased_from.build_args[:from]).to eq("\"Finn the Dog\" <#{finn_email}>")
end
it "email_site_title will be added if it's set" do
SiteSetting.email_site_title = "The Forum"
expect(build_args[:from]).to eq("The Forum <#{SiteSetting.notification_email}>")
expect(build_args[:from]).to eq("\"The Forum\" <#{SiteSetting.notification_email}>")
end
it "email_site_title overrides title" do
SiteSetting.title = "Dog Talk"
SiteSetting.email_site_title = "The Forum"
expect(build_args[:from]).to eq("The Forum <#{SiteSetting.notification_email}>")
expect(build_args[:from]).to eq("\"The Forum\" <#{SiteSetting.notification_email}>")
end
it "cleans up aliases in the from_alias arg" do
builder = Email::MessageBuilder.new(to_address, from_alias: "Finn: the Dog, <3", from: finn_email)
expect(builder.build_args[:from]).to eq("Finn the Dog 3 <#{finn_email}>")
expect(builder.build_args[:from]).to eq("\"Finn the Dog 3\" <#{finn_email}>")
end
it "cleans up the email_site_title" do
SiteSetting.stubs(:email_site_title).returns("::>>>Best Forum, EU: Award Winning<<<")
expect(build_args[:from]).to eq("Best Forum EU Award Winning <#{SiteSetting.notification_email}>")
SiteSetting.stubs(:email_site_title).returns("::>>>Best \"Forum\", EU: Award Winning<<<")
expect(build_args[:from]).to eq("\"Best Forum EU Award Winning\" <#{SiteSetting.notification_email}>")
end
end