Merge branch 'master' of git://github.com/rails/rails

3 files changed, 8 insertions, 39 deletions

diff --git a/actionmailer/test/old_base/mail_layout_test.rb b/actionmailer/test/old_base/mail_layout_test.rb
index 5679aa5a64..2c2daa0f28 100644
--- a/actionmailer/test/old_base/mail_layout_test.rb
+++ b/actionmailer/test/old_base/mail_layout_test.rb
@@ -69,47 +69,25 @@ class LayoutMailerTest < Test::Unit::TestCase
 
   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
 
diff --git a/actionmailer/test/old_base/mail_service_test.rb b/actionmailer/test/old_base/mail_service_test.rb
index 70dafaf33c..e49307bfda 100644
--- a/actionmailer/test/old_base/mail_service_test.rb
+++ b/actionmailer/test/old_base/mail_service_test.rb
@@ -340,6 +340,8 @@ class ActionMailerTest < Test::Unit::TestCase
 
     @original_logger = TestMailer.logger
     @recipient = 'test@localhost'
+
+    TestMailer.delivery_method = :test
   end
 
   def teardown
@@ -444,9 +446,6 @@ class ActionMailerTest < Test::Unit::TestCase
     expected.from    = "system@loudthinking.com"
     expected.date    = Time.local(2004, 12, 12)
 
-    # Stub the render method so no alternative renderers need be present.
-    ActionView::Base.any_instance.stubs(:render).returns("Hello there, \n\nMr. #{@recipient}")
-
     # Now that the template is registered, there should be one part. The text/plain part.
     created = nil
     assert_nothing_raised { created = TestMailer.custom_templating_extension(@recipient) }
@@ -1194,6 +1193,6 @@ class RespondToTest < Test::Unit::TestCase
       RespondToMailer.not_a_method
     end
 
-    assert_match(/undefined method.*not_a_method/, error.message)
+    assert_match(/method.*not_a_method/, error.message)
   end
-end
\ No newline at end of file
+end
diff --git a/actionmailer/test/old_base/url_test.rb b/actionmailer/test/old_base/url_test.rb
index 60740d6b0b..17b383cc2a 100644
--- a/actionmailer/test/old_base/url_test.rb
+++ b/actionmailer/test/old_base/url_test.rb
@@ -10,7 +10,7 @@ class ActionMailer::Base
   include AppRoutes.url_helpers
 end
 
-class TestMailer < ActionMailer::Base
+class UrlTestMailer < ActionMailer::Base
   default_url_options[:host] = 'www.basecamphq.com'
 
   configure do |c|
@@ -26,14 +26,6 @@ class TestMailer < ActionMailer::Base
     @recipient   = recipient
     @welcome_url = url_for :host => "example.com", :controller => "welcome", :action => "greeting"
   end
-
-  class <<self
-    attr_accessor :received_body
-  end
-
-  def receive(mail)
-    self.class.received_body = mail.body
-  end
 end
 
 class ActionMailerUrlTest < Test::Unit::TestCase
@@ -65,7 +57,7 @@ class ActionMailerUrlTest < Test::Unit::TestCase
   end
 
   def test_signed_up_with_url
-    TestMailer.delivery_method = :test
+    UrlTestMailer.delivery_method = :test
     
     AppRoutes.draw do |map|
       map.connect ':controller/:action/:id'
@@ -80,14 +72,14 @@ class ActionMailerUrlTest < Test::Unit::TestCase
     expected.date    = Time.local(2004, 12, 12)
 
     created = nil
-    assert_nothing_raised { created = TestMailer.signed_up_with_url(@recipient) }
+    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 { TestMailer.signed_up_with_url(@recipient).deliver }
+    assert_nothing_raised { UrlTestMailer.signed_up_with_url(@recipient).deliver }
     assert_not_nil ActionMailer::Base.deliveries.first
     delivered = ActionMailer::Base.deliveries.first