diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-30 09:46:09 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-30 09:46:09 -0700 |
| commit | 6e170e1b71bddcfece093700384373e33d3866b2 (patch) | |
| tree | 8df089da9e5f06dbd0c0c7fd6600051e49d6f210 /actionmailer/test | |
| parent | bacae8739b0a673e34884ad4db53b9e00c9620bd (diff) | |
| parent | 2ff2f839ca7e8138114c2fbc7df6cad0e6bf10ee (diff) | |
| download | rails-6e170e1b71bddcfece093700384373e33d3866b2.tar.gz rails-6e170e1b71bddcfece093700384373e33d3866b2.tar.bz2 rails-6e170e1b71bddcfece093700384373e33d3866b2.zip | |
Merge pull request #10004 from choudhuryanupam/master
Refactored to remove unnecessary setup
Diffstat (limited to 'actionmailer/test')
| -rw-r--r-- | actionmailer/test/asset_host_test.rb | 1 | ||||
| -rw-r--r-- | actionmailer/test/url_test.rb | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/actionmailer/test/asset_host_test.rb b/actionmailer/test/asset_host_test.rb index 32ae76a7c5..00f1348a53 100644 --- a/actionmailer/test/asset_host_test.rb +++ b/actionmailer/test/asset_host_test.rb @@ -16,7 +16,6 @@ class AssetHostTest < ActiveSupport::TestCase ActionMailer::Base.deliveries.clear AssetHostMailer.configure do |c| c.asset_host = "http://www.example.com" - c.assets_dir = '' end end diff --git a/actionmailer/test/url_test.rb b/actionmailer/test/url_test.rb index dcd80f46b5..589944fa69 100644 --- a/actionmailer/test/url_test.rb +++ b/actionmailer/test/url_test.rb @@ -41,18 +41,9 @@ class ActionMailerUrlTest < ActionMailer::TestCase end def setup - set_delivery_method :test - ActionMailer::Base.perform_deliveries = true - ActionMailer::Base.deliveries.clear - ActiveSupport::Deprecation.silenced = false - @recipient = 'test@localhost' end - def teardown - restore_delivery_method - end - def test_signed_up_with_url UrlTestMailer.delivery_method = :test |