From 0bd1a4e05c6cb6d9028a8c69f769cf21d70516f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
<rafaelmfranca@gmail.com>
Date: Tue, 7 Oct 2014 20:01:40 -0300
Subject: Only include the needed assertions
---
actionmailer/lib/action_mailer/test_case.rb | 3 ++-
actionmailer/test/base_test.rb | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/actionmailer/lib/action_mailer/test_case.rb b/actionmailer/lib/action_mailer/test_case.rb
index bdda66b32a..766215ce96 100644
--- a/actionmailer/lib/action_mailer/test_case.rb
+++ b/actionmailer/lib/action_mailer/test_case.rb
@@ -16,7 +16,8 @@ module ActionMailer
include ActiveSupport::Testing::ConstantLookup
include TestHelper
- include Rails::Dom::Testing::Assertions
+ include Rails::Dom::Testing::Assertions::SelectorAssertions
+ include Rails::Dom::Testing::Assertions::DomAssertions
included do
class_attribute :_mailer_class
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 0da22f591f..396d0a95b5 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -10,7 +10,7 @@ require 'mailers/proc_mailer'
require 'mailers/asset_mailer'
class BaseTest < ActiveSupport::TestCase
- include Rails::Dom::Testing::Assertions
+ include Rails::Dom::Testing::Assertions::DomAssertions
setup do
@original_delivery_method = ActionMailer::Base.delivery_method
--
cgit v1.2.3