From d9ec6888e115e280c9c0ad1194c6b5e6a2b37890 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 4 May 2015 11:08:17 +0530
Subject: [PATCH] FIX: allow site_name to be present in rejection email subject

---
 app/mailers/rejection_mailer.rb       |  2 +-
 spec/mailers/rejection_mailer_spec.rb | 29 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 spec/mailers/rejection_mailer_spec.rb

diff --git a/app/mailers/rejection_mailer.rb b/app/mailers/rejection_mailer.rb
index 6eaf4b915..1c1a7558b 100644
--- a/app/mailers/rejection_mailer.rb
+++ b/app/mailers/rejection_mailer.rb
@@ -3,7 +3,7 @@ require_dependency 'email/message_builder'
 class RejectionMailer < ActionMailer::Base
   include Email::BuildEmailHelper
 
-  DISALLOWED_TEMPLATE_ARGS = [:to, :from, :site_name, :base_url,
+  DISALLOWED_TEMPLATE_ARGS = [:to, :from, :base_url,
                               :user_preferences_url,
                               :include_respond_instructions, :html_override,
                               :add_unsubscribe_link, :respond_instructions,
diff --git a/spec/mailers/rejection_mailer_spec.rb b/spec/mailers/rejection_mailer_spec.rb
new file mode 100644
index 000000000..141400090
--- /dev/null
+++ b/spec/mailers/rejection_mailer_spec.rb
@@ -0,0 +1,29 @@
+require "spec_helper"
+
+describe RejectionMailer do
+
+  describe "send_rejection" do
+
+    context 'sends rejection email' do
+      let (:user) { Fabricate(:user) }
+      let (:template_args) { {former_title: "Mail Subject", destination: user.email, site_name: SiteSetting.title} }
+      let (:reject_mail) { RejectionMailer.send_rejection("email_reject_topic_not_found", user.email, template_args) }
+
+      it 'renders the senders email' do
+        expect(reject_mail.to).to eql([user.email])
+      end
+
+      it 'renders the subject' do
+        expect(reject_mail.subject).to be_present
+      end
+
+      it 'renders site title in subject' do
+        expect(reject_mail.subject).to match(SiteSetting.title)
+      end
+
+      it 'renders the body' do
+        expect(reject_mail.body).to be_present
+      end
+    end
+  end
+end