diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-15 13:20:14 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-15 13:40:18 -0300 |
| commit | 126a15e0fe6a0021dd8bc37d32a2498a9c22cafd (patch) | |
| tree | d87e7ade5aa8ad465c2215876bec2ce98fe6d0a4 | |
| parent | 75fe384c81c68217f49dc5ccba408cdd00766f8d (diff) | |
| download | rails-126a15e0fe6a0021dd8bc37d32a2498a9c22cafd.tar.gz rails-126a15e0fe6a0021dd8bc37d32a2498a9c22cafd.tar.bz2 rails-126a15e0fe6a0021dd8bc37d32a2498a9c22cafd.zip | |
Include the selector assertions on the test case
We don't need to require users to include this module on
ActionMailer::TestCase
| -rw-r--r-- | actionmailer/lib/action_mailer/test_case.rb | 2 | ||||
| -rw-r--r-- | actionmailer/test/assert_select_email_test.rb | 3 | ||||
| -rw-r--r-- | actionview/test/template/atom_feed_helper_test.rb | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/actionmailer/lib/action_mailer/test_case.rb b/actionmailer/lib/action_mailer/test_case.rb index 9207c1bc56..d507032838 100644 --- a/actionmailer/lib/action_mailer/test_case.rb +++ b/actionmailer/lib/action_mailer/test_case.rb @@ -1,4 +1,5 @@ require 'active_support/test_case' +require 'rails-dom-testing' module ActionMailer class NonInferrableMailerError < ::StandardError @@ -15,6 +16,7 @@ module ActionMailer include ActiveSupport::Testing::ConstantLookup include TestHelper + include Rails::Dom::Testing::Assertions::SelectorAssertions included do class_attribute :_mailer_class diff --git a/actionmailer/test/assert_select_email_test.rb b/actionmailer/test/assert_select_email_test.rb index 376d97bdd7..57ae3436e1 100644 --- a/actionmailer/test/assert_select_email_test.rb +++ b/actionmailer/test/assert_select_email_test.rb @@ -1,9 +1,6 @@ require 'abstract_unit' -require 'rails-dom-testing' class AssertSelectEmailTest < ActionMailer::TestCase - include Rails::Dom::Testing::Assertions::SelectorAssertions - class AssertSelectMailer < ActionMailer::Base def test(html) mail body: html, content_type: "text/html", diff --git a/actionview/test/template/atom_feed_helper_test.rb b/actionview/test/template/atom_feed_helper_test.rb index 9d306310ea..a2d6b81aad 100644 --- a/actionview/test/template/atom_feed_helper_test.rb +++ b/actionview/test/template/atom_feed_helper_test.rb @@ -207,8 +207,6 @@ end class AtomFeedTest < ActionController::TestCase tests ScrollsController - include Rails::Dom::Testing::Assertions::SelectorAssertions - def setup super @request.host = "www.nextangle.com" |