Deprecate the old mailer API that was not deprecated yet.

6 files changed, 11 insertions, 299 deletions

diff --git a/actionmailer/test/old_base/adv_attr_test.rb b/actionmailer/test/old_base/adv_attr_test.rb
index f22d733bc5..c5a6b6d88b 100644
--- a/actionmailer/test/old_base/adv_attr_test.rb
+++ b/actionmailer/test/old_base/adv_attr_test.rb
@@ -11,9 +11,14 @@ class AdvAttrTest < ActiveSupport::TestCase
   end
 
   def setup
+    ActiveSupport::Deprecation.silenced = true
     @person = Person.new
   end
 
+  def teardown
+    ActiveSupport::Deprecation.silenced = false
+  end
+
   def test_adv_attr
     assert_nil @person.name
     @person.name 'Bob'
diff --git a/actionmailer/test/old_base/asset_host_test.rb b/actionmailer/test/old_base/asset_host_test.rb
deleted file mode 100644
index cc13c8a4d7..0000000000
--- a/actionmailer/test/old_base/asset_host_test.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'abstract_unit'
-require 'action_controller'
-
-class AssetHostMailer < ActionMailer::Base
-  def email_with_asset
-    recipients 'test@localhost'
-    subject    "testing email containing asset path while asset_host is set"
-    from       "tester@example.com"
-  end
-end
-
-class AssetHostTest < Test::Unit::TestCase
-  def setup
-    set_delivery_method :test
-    ActionMailer::Base.perform_deliveries = true
-    ActionMailer::Base.deliveries.clear
-    AssetHostMailer.configure do |c|
-      c.asset_host = "http://www.example.com"
-      c.assets_dir = ''
-    end
-  end
-
-  def teardown
-    restore_delivery_method
-  end
-
-  def test_asset_host_as_string
-    mail = AssetHostMailer.email_with_asset
-    assert_equal %Q{<img alt="Somelogo" src="http://www.example.com/images/somelogo.png" />}, mail.body.to_s.strip
-  end
-
-  def test_asset_host_as_one_arguement_proc
-    AssetHostMailer.config.asset_host = Proc.new { |source|
-      if source.starts_with?('/images')
-        "http://images.example.com"
-      else
-        "http://assets.example.com"
-      end
-    }
-    mail = AssetHostMailer.email_with_asset
-    assert_equal %Q{<img alt="Somelogo" src="http://images.example.com/images/somelogo.png" />}, mail.body.to_s.strip
-  end
-
-  def test_asset_host_as_two_arguement_proc
-    ActionController::Base.config.asset_host = Proc.new {|source,request|
-      if request && request.ssl?
-        "https://www.example.com"
-      else
-        "http://www.example.com"
-      end
-    }
-    mail = nil
-    assert_nothing_raised { mail = AssetHostMailer.email_with_asset }
-    assert_equal %Q{<img alt="Somelogo" src="http://www.example.com/images/somelogo.png" />}, mail.body.to_s.strip
-  end
-end
diff --git a/actionmailer/test/old_base/mail_layout_test.rb b/actionmailer/test/old_base/mail_layout_test.rb
deleted file mode 100644
index 2c2daa0f28..0000000000
--- a/actionmailer/test/old_base/mail_layout_test.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-require 'abstract_unit'
-
-class AutoLayoutMailer < ActionMailer::Base
-
-  def hello
-    recipients 'test@localhost'
-    subject    "You have a mail"
-    from       "tester@example.com"
-  end
-
-  def spam
-    recipients 'test@localhost'
-    subject    "You have a mail"
-    from       "tester@example.com"
-
-    @world = "Earth"
-    body render(:inline => "Hello, <%= @world %>", :layout => 'spam')
-  end
-
-  def nolayout
-    recipients 'test@localhost'
-    subject    "You have a mail"
-    from       "tester@example.com"
-
-    @world = "Earth"
-    body render(:inline => "Hello, <%= @world %>", :layout => false)
-  end
-
-  def multipart(type = nil)
-    recipients 'test@localhost'
-    subject    "You have a mail"
-    from       "tester@example.com"
-
-    content_type(type) if type
-  end
-end
-
-class ExplicitLayoutMailer < ActionMailer::Base
-  layout 'spam', :except => [:logout]
-
-  def signup
-    recipients 'test@localhost'
-    subject    "You have a mail"
-    from       "tester@example.com"
-  end
-
-  def logout
-    recipients 'test@localhost'
-    subject    "You have a mail"
-    from       "tester@example.com"
-  end
-end
-
-class LayoutMailerTest < Test::Unit::TestCase
-  def setup
-    set_delivery_method :test
-    ActionMailer::Base.perform_deliveries = true
-    ActionMailer::Base.deliveries.clear
-  end
-
-  def teardown
-    restore_delivery_method
-  end
-
-  def test_should_pickup_default_layout
-    mail = AutoLayoutMailer.hello
-    assert_equal "Hello from layout Inside", mail.body.to_s.strip
-  end
-
-  def test_should_pickup_multipart_layout
-    mail = AutoLayoutMailer.multipart
-    assert_equal "multipart/alternative", mail.mime_type
-    assert_equal 2, mail.parts.size
-
-    assert_equal 'text/plain', mail.parts.first.mime_type
-    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.to_s
-
-    assert_equal 'text/html', mail.parts.last.mime_type
-    assert_equal "Hello from layout text/html multipart", mail.parts.last.body.to_s
-  end
-
-  def test_should_pickup_multipartmixed_layout
-    mail = AutoLayoutMailer.multipart("multipart/mixed")
-    assert_equal "multipart/mixed", mail.mime_type
-    assert_equal 2, mail.parts.size
-
-    assert_equal 'text/plain', mail.parts.first.mime_type
-    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.to_s
-
-    assert_equal 'text/html', mail.parts.last.mime_type
-    assert_equal "Hello from layout text/html multipart", mail.parts.last.body.to_s
-  end
-
-  def test_should_fix_multipart_layout
-    mail = AutoLayoutMailer.multipart("text/plain")
-    assert_equal "multipart/alternative", mail.mime_type
-    assert_equal 2, mail.parts.size
-
-    assert_equal 'text/plain', mail.parts.first.mime_type
-    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.to_s
-
-    assert_equal 'text/html', mail.parts.last.mime_type
-    assert_equal "Hello from layout text/html multipart", mail.parts.last.body.to_s
-  end
-
-
-  def test_should_pickup_layout_given_to_render
-    mail = AutoLayoutMailer.spam
-    assert_equal "Spammer layout Hello, Earth", mail.body.to_s.strip
-  end
-
-  def test_should_respect_layout_false
-    mail = AutoLayoutMailer.nolayout
-    assert_equal "Hello, Earth", mail.body.to_s.strip
-  end
-
-  def test_explicit_class_layout
-    mail = ExplicitLayoutMailer.signup
-    assert_equal "Spammer layout We do not spam", mail.body.to_s.strip
-  end
-
-  def test_explicit_layout_exceptions
-    mail = ExplicitLayoutMailer.logout
-    assert_equal "You logged out", mail.body.to_s.strip
-  end
-end
diff --git a/actionmailer/test/old_base/mail_render_test.rb b/actionmailer/test/old_base/mail_render_test.rb
index 9b1455da33..3a1d3184f4 100644
--- a/actionmailer/test/old_base/mail_render_test.rb
+++ b/actionmailer/test/old_base/mail_render_test.rb
@@ -19,18 +19,6 @@ class RenderMailer < ActionMailer::Base
     body       render(:file => "templates/signed_up")
   end
 
-  def rxml_template
-    recipients 'test@localhost'
-    subject    "rendering rxml template"
-    from       "tester@example.com"
-  end
-
-  def included_subtemplate
-    recipients 'test@localhost'
-    subject    "Including another template in the one being rendered"
-    from       "tester@example.com"
-  end
-
   def no_instance_variable
     recipients 'test@localhost'
     subject    "No Instance Variable"
@@ -41,11 +29,6 @@ class RenderMailer < ActionMailer::Base
     end
   end
 
-  def initialize_defaults(method_name)
-    super
-    mailer_name "test_mailer"
-  end
-
   def multipart_alternative
     recipients 'test@localhost'
     subject    'multipart/alternative'
@@ -97,11 +80,13 @@ class RenderHelperTest < Test::Unit::TestCase
     set_delivery_method :test
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries.clear
+    ActiveSupport::Deprecation.silenced = true
 
     @recipient = 'test@localhost'
   end
 
   def teardown
+    ActiveSupport::Deprecation.silenced = false
     restore_delivery_method
   end
 
@@ -115,16 +100,6 @@ class RenderHelperTest < Test::Unit::TestCase
     assert_equal "Hello there,\n\nMr. test@localhost", mail.body.to_s.strip
   end
 
-  def test_rxml_template
-    mail = RenderMailer.rxml_template.deliver
-    assert_equal %(<?xml version="1.0" encoding="UTF-8"?>\n<test/>), mail.body.to_s.strip
-  end
-
-  def test_included_subtemplate
-    mail = RenderMailer.included_subtemplate.deliver
-    assert_equal "Hey Ho, let's go!", mail.body.to_s.strip
-  end
-
   def test_no_instance_variable
     mail = RenderMailer.no_instance_variable.deliver
     assert_equal "Look, subject.nil? is true!", mail.body.to_s.strip
@@ -134,6 +109,7 @@ end
 class FirstSecondHelperTest < Test::Unit::TestCase
   def setup
     set_delivery_method :test
+    ActiveSupport::Deprecation.silenced = true
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries.clear
 
@@ -141,6 +117,7 @@ class FirstSecondHelperTest < Test::Unit::TestCase
   end
 
   def teardown
+    ActiveSupport::Deprecation.silenced = false
     restore_delivery_method
   end
 
diff --git a/actionmailer/test/old_base/mail_service_test.rb b/actionmailer/test/old_base/mail_service_test.rb
index 49647c9612..93921978b6 100644
--- a/actionmailer/test/old_base/mail_service_test.rb
+++ b/actionmailer/test/old_base/mail_service_test.rb
@@ -334,6 +334,7 @@ class ActionMailerTest < Test::Unit::TestCase
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.raise_delivery_errors = true
     ActionMailer::Base.deliveries.clear
+    ActiveSupport::Deprecation.silenced = true
 
     @original_logger = TestMailer.logger
     @recipient = 'test@localhost'
@@ -343,6 +344,7 @@ class ActionMailerTest < Test::Unit::TestCase
 
   def teardown
     TestMailer.logger = @original_logger
+    ActiveSupport::Deprecation.silenced = false
     restore_delivery_method
   end
 
diff --git a/actionmailer/test/old_base/url_test.rb b/actionmailer/test/old_base/url_test.rb
deleted file mode 100644
index 573186dbee..0000000000
--- a/actionmailer/test/old_base/url_test.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-require 'abstract_unit'
-require 'action_controller'
-
-class WelcomeController < ActionController::Base
-end
-
-AppRoutes = ActionDispatch::Routing::RouteSet.new
-
-class ActionMailer::Base
-  include AppRoutes.url_helpers
-end
-
-class UrlTestMailer < ActionMailer::Base
-  default_url_options[:host] = 'www.basecamphq.com'
-
-  configure do |c|
-    c.assets_dir = '' # To get the tests to pass
-  end
-
-  def signed_up_with_url(recipient)
-    @recipients   = recipient
-    @subject      = "[Signed up] Welcome #{recipient}"
-    @from         = "system@loudthinking.com"
-    @sent_on      = Time.local(2004, 12, 12)
-
-    @recipient   = recipient
-    @welcome_url = url_for :host => "example.com", :controller => "welcome", :action => "greeting"
-  end
-end
-
-class ActionMailerUrlTest < ActionMailer::TestCase
-
-  def encode( text, charset="UTF-8" )
-    quoted_printable( text, charset )
-  end
-
-  def new_mail( charset="UTF-8" )
-    mail = Mail.new
-    mail.mime_version = "1.0"
-    if charset
-      mail.content_type ["text", "plain", { "charset" => charset }]
-    end
-    mail
-  end
-
-  def setup
-    set_delivery_method :test
-    ActionMailer::Base.perform_deliveries = true
-    ActionMailer::Base.deliveries.clear
-
-    @recipient = 'test@localhost'
-  end
-
-  def teardown
-    restore_delivery_method
-  end
-
-  def test_signed_up_with_url
-    UrlTestMailer.delivery_method = :test
-
-    assert_deprecated do
-      AppRoutes.draw do |map|
-        map.connect ':controller/:action/:id'
-        map.welcome 'welcome', :controller=>"foo", :action=>"bar"
-      end
-    end
-
-    expected = new_mail
-    expected.to      = @recipient
-    expected.subject = "[Signed up] Welcome #{@recipient}"
-    expected.body    = "Hello there,\n\nMr. #{@recipient}. Please see our greeting at http://example.com/welcome/greeting http://www.basecamphq.com/welcome\n\n<img alt=\"Somelogo\" src=\"/images/somelogo.png\" />"
-    expected.from    = "system@loudthinking.com"
-    expected.date    = Time.local(2004, 12, 12)
-
-    created = nil
-    assert_nothing_raised { created = UrlTestMailer.signed_up_with_url(@recipient) }
-    assert_not_nil created
-
-    expected.message_id = '<123@456>'
-    created.message_id = '<123@456>'
-    assert_equal expected.encoded, created.encoded
-
-    assert_nothing_raised { UrlTestMailer.signed_up_with_url(@recipient).deliver }
-    assert_not_nil ActionMailer::Base.deliveries.first
-    delivered = ActionMailer::Base.deliveries.first
-
-    delivered.message_id = '<123@456>'
-    assert_equal expected.encoded, delivered.encoded
-  end
-end