From 3af4c864653297ff2796f6d5ddf1836e6906fd9b Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Wed, 15 Jul 2015 18:06:15 -0300 Subject: [PATCH] Fix email template content type --- app/helpers/email_template_helper.rb | 7 +++++-- test/unit/email_template_helper_test.rb | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/helpers/email_template_helper.rb b/app/helpers/email_template_helper.rb index 5769e1f..6f16ee4 100644 --- a/app/helpers/email_template_helper.rb +++ b/app/helpers/email_template_helper.rb @@ -1,8 +1,11 @@ module EmailTemplateHelper def mail_with_template(params={}) - params[:body] = params[:email_template].present? ? params[:email_template].parsed_body(params[:template_params]) : params[:body] - params[:subject] = params[:email_template].present? ? params[:email_template].parsed_subject(params[:template_params]) : params[:subject] + if params[:email_template].present? + params[:body] = params[:email_template].parsed_body(params[:template_params]) + params[:subject] = params[:email_template].parsed_subject(params[:template_params]) + params[:content_type] = "text/html" + end mail(params.except(:email_template)) end diff --git a/test/unit/email_template_helper_test.rb b/test/unit/email_template_helper_test.rb index eaaeb97..1bfb2c8 100644 --- a/test/unit/email_template_helper_test.rb +++ b/test/unit/email_template_helper_test.rb @@ -7,7 +7,7 @@ class EmailTemplateHelperTest < ActionView::TestCase template.expects(:parsed_body).returns('parsed body') template.expects(:parsed_subject).returns('parsed subject') params = {:subject => 'subject', :body => 'body', :email_template => template} - expects(:mail).with({:subject => 'parsed subject', :body => 'parsed body'}) + expects(:mail).with({:subject => 'parsed subject', :body => 'parsed body', :content_type => 'text/html'}) mail_with_template(params) end -- libgit2 0.21.2