]> git.openstreetmap.org Git - rails.git/blobdiff - test/functional/old_way_controller_test.rb
Merge branch 'master' into openid
[rails.git] / test / functional / old_way_controller_test.rb
index c47b45dfcac4af56db4d1cbbf31e748e43ca7c4c..31da1d2c784bb18d6598cbc52a486b77760343d7 100644 (file)
@@ -1,18 +1,9 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'old_way_controller'
 
-# Re-raise errors caught by the controller.
-class OldWayController; def rescue_action(e) raise e end; end
-
-class OldWayControllerTest < Test::Unit::TestCase
+class OldWayControllerTest < ActionController::TestCase
   api_fixtures
 
-  def setup
-    @controller = OldWayController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
   # -------------------------------------
   # Test reading old ways.
   # -------------------------------------