diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-10-07 20:01:40 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-10-07 20:01:40 -0300 |
| commit | 0bd1a4e05c6cb6d9028a8c69f769cf21d70516f4 (patch) | |
| tree | 24a074b34b94ea9262d641cf6db51e82c8081d1a /actionmailer | |
| parent | 2b3d67d64be29c3e2aa6f7782686f677236d3aaf (diff) | |
| download | rails-0bd1a4e05c6cb6d9028a8c69f769cf21d70516f4.tar.gz rails-0bd1a4e05c6cb6d9028a8c69f769cf21d70516f4.tar.bz2 rails-0bd1a4e05c6cb6d9028a8c69f769cf21d70516f4.zip | |
Only include the needed assertions
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/test_case.rb | 3 | ||||
| -rw-r--r-- | 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 |