Merging 17824:17845 from trunk to blocking branch.

[rails.git] / test / functional / message_controller_test.rb

diff --git a/test/functional/message_controller_test.rb b/test/functional/message_controller_test.rb
index 54c8a18d12952265bd681b8fdbf00ce2999dc9e1..96f509cb0208b3548753e4fd5f351bdf65822b4c 100644 (file)
--- a/test/functional/message_controller_test.rb
+++ b/test/functional/message_controller_test.rb
@@ -1,15 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'message_controller'
 
-# Re-raise errors caught by the controller.
-class MessageController; def rescue_action(e) raise e end; end
-
-class MessageControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = MessageController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
+class MessageControllerTest < ActionController::TestCase
 
   # Replace this with your real tests.
   def test_truth