diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-10-07 20:00:17 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-10-07 20:00:17 -0300 |
| commit | 2b3d67d64be29c3e2aa6f7782686f677236d3aaf (patch) | |
| tree | 7a5f1ab7ad122756f9f215dd3680e479e7da1d7e /actionmailer/lib | |
| parent | 4b8f0f8b0937e8043f9eb3c35203b244b1e00d6f (diff) | |
| parent | e6b0b760cc8bac99765fc43b182505db73e6586b (diff) | |
| download | rails-2b3d67d64be29c3e2aa6f7782686f677236d3aaf.tar.gz rails-2b3d67d64be29c3e2aa6f7782686f677236d3aaf.tar.bz2 rails-2b3d67d64be29c3e2aa6f7782686f677236d3aaf.zip | |
Merge pull request #17204 from schneems/schneems/fix-am-tests-master
fix tests on action_mailer
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/test_case.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/test_case.rb b/actionmailer/lib/action_mailer/test_case.rb index b53d2b7fa0..bdda66b32a 100644 --- a/actionmailer/lib/action_mailer/test_case.rb +++ b/actionmailer/lib/action_mailer/test_case.rb @@ -16,7 +16,7 @@ module ActionMailer include ActiveSupport::Testing::ConstantLookup include TestHelper - include Rails::Dom::Testing::Assertions::SelectorAssertions + include Rails::Dom::Testing::Assertions included do class_attribute :_mailer_class |