Move old tests to a specific folder and add some delivery method tests.

1 files changed, 0 insertions, 148 deletions

diff --git a/actionmailer/test/mail_layout_test.rb b/actionmailer/test/mail_layout_test.rb
deleted file mode 100644
index 4038fbf339..0000000000
--- a/actionmailer/test/mail_layout_test.rb
+++ /dev/null
@@ -1,148 +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"
-    render(:inline => "Hello, <%= @world %>", :layout => 'spam')
-  end
-
-  def nolayout
-    recipients 'test@localhost'
-    subject    "You have a mail"
-    from       "tester@example.com"
-
-    @world = "Earth"
-    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
-    # CHANGED: content_type returns an object
-    # assert_equal "multipart/alternative", mail.content_type
-    assert_equal "multipart/alternative", mail.mime_type
-    assert_equal 2, mail.parts.size
-
-    # CHANGED: content_type returns an object
-    # assert_equal 'text/plain', mail.parts.first.content_type
-    assert_equal 'text/plain', mail.parts.first.mime_type
-    
-    # CHANGED: body returns an object
-    # assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body
-    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.to_s
-
-    # CHANGED: content_type returns an object
-    # assert_equal 'text/html', mail.parts.last.content_type
-    assert_equal 'text/html', mail.parts.last.mime_type
-
-    # CHANGED: body returns an object
-    # assert_equal "Hello from layout text/html multipart", mail.parts.last.body
-    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")
-    # CHANGED: content_type returns an object
-    # assert_equal "multipart/mixed", mail.content_type
-    assert_equal "multipart/mixed", mail.mime_type
-    assert_equal 2, mail.parts.size
-
-    # CHANGED: content_type returns an object
-    # assert_equal 'text/plain', mail.parts.first.content_type
-    assert_equal 'text/plain', mail.parts.first.mime_type
-    # CHANGED: body returns an object
-    # assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body
-    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.to_s
-
-    # CHANGED: content_type returns an object
-    # assert_equal 'text/html', mail.parts.last.content_type
-    assert_equal 'text/html', mail.parts.last.mime_type
-    # CHANGED: body returns an object
-    # assert_equal "Hello from layout text/html multipart", mail.parts.last.body
-    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