From e6b0b760cc8bac99765fc43b182505db73e6586b Mon Sep 17 00:00:00 2001 From: schneems Date: Tue, 7 Oct 2014 17:40:59 -0500 Subject: fix tests on action_mailer Include appropriate helpers and use `assert_dom_equal` where applicable --- actionmailer/test/base_test.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'actionmailer/test/base_test.rb') diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index dcb6959543..0da22f591f 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -10,6 +10,8 @@ require 'mailers/proc_mailer' require 'mailers/asset_mailer' class BaseTest < ActiveSupport::TestCase + include Rails::Dom::Testing::Assertions + setup do @original_delivery_method = ActionMailer::Base.delivery_method ActionMailer::Base.delivery_method = :test @@ -536,7 +538,7 @@ class BaseTest < ActiveSupport::TestCase mail = AssetMailer.welcome - assert_equal(%{Dummy}, mail.body.to_s.strip) + assert_dom_equal(%{Dummy}, mail.body.to_s.strip) end test "assets tags should use a Mailer's asset_host settings when available" do @@ -550,7 +552,7 @@ class BaseTest < ActiveSupport::TestCase mail = TempAssetMailer.welcome - assert_equal(%{Dummy}, mail.body.to_s.strip) + assert_dom_equal(%{Dummy}, mail.body.to_s.strip) end test 'the view is not rendered when mail was never called' do -- cgit v1.2.3