From b0dbb0ea13e02f18075e2a6f95f231a17a95bd27 Mon Sep 17 00:00:00 2001 From: Anton Batenev Date: Tue, 9 Jul 2013 20:19:10 +0400 Subject: [PATCH] And add tests for empty string & null --- app/models/site_setting.rb | 2 +- lib/email/message_builder.rb | 2 +- spec/components/email/message_builder_spec.rb | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb index a4c1b937e39..90d11db4387 100644 --- a/app/models/site_setting.rb +++ b/app/models/site_setting.rb @@ -129,7 +129,7 @@ class SiteSetting < ActiveRecord::Base # we need to think of a way to force users to enter certain settings, this is a minimal config thing setting(:notification_email, 'info@discourse.org') - setting(:email_custom_headers, 'Precedence: bulk|Auto-Submitted: auto-generated') + setting(:email_custom_headers, 'Auto-Submitted: auto-generated') setting(:allow_index_in_robots_txt, true) diff --git a/lib/email/message_builder.rb b/lib/email/message_builder.rb index da58a0c1004..e376450f107 100644 --- a/lib/email/message_builder.rb +++ b/lib/email/message_builder.rb @@ -87,7 +87,7 @@ module Email value = header[1].strip result[name] = value if name.length > 0 && value.length > 0 end - } + } if !string.nil? result end diff --git a/spec/components/email/message_builder_spec.rb b/spec/components/email/message_builder_spec.rb index 9d2ec3e00be..3e1310e63a3 100644 --- a/spec/components/email/message_builder_spec.rb +++ b/spec/components/email/message_builder_spec.rb @@ -84,6 +84,14 @@ describe Email::MessageBuilder do expect(Email::MessageBuilder.custom_headers(custom_headers_string)).to eq(custom_headers_result) end + it "empty headers builder" do + expect(Email::MessageBuilder.custom_headers("")).to eq({}) + end + + it "null headers builder" do + expect(Email::MessageBuilder.custom_headers(nil)).to eq({}) + end + end context "header args" do