Merge branch 'rails'

Conflicts:
	actionmailer/lib/action_mailer.rb
	actionmailer/lib/action_mailer/delivery_method/smtp.rb

1 files changed, 4 insertions, 4 deletions

diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 35c51ca7ea..fdf3db1cdb 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -106,8 +106,8 @@ module RenderTestCases
 
   def test_render_partial_with_errors
     @view.render(:partial => "test/raise")
-    flunk "Render did not raise TemplateError"
-  rescue ActionView::TemplateError => e
+    flunk "Render did not raise Template::Error"
+  rescue ActionView::Template::Error => e
     assert_match "undefined local variable or method `doesnt_exist'", e.message
     assert_equal "", e.sub_template_message
     assert_equal "1", e.line_number
@@ -116,8 +116,8 @@ module RenderTestCases
 
   def test_render_sub_template_with_errors
     @view.render(:file => "test/sub_template_raise")
-    flunk "Render did not raise TemplateError"
-  rescue ActionView::TemplateError => e
+    flunk "Render did not raise Template::Error"
+  rescue ActionView::Template::Error => e
     assert_match "undefined local variable or method `doesnt_exist'", e.message
     assert_equal "Trace of template inclusion: #{File.expand_path("#{FIXTURE_LOAD_PATH}/test/sub_template_raise.html.erb")}", e.sub_template_message
     assert_equal "1", e.line_number