a few more amf tests and associated bug fixes

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

diff --git a/test/functional/old_relation_controller_test.rb b/test/functional/old_relation_controller_test.rb
index b8bf464b6030fd180dced5c4f75dc88efdfed56e..a52211e2e15485ee28c7acb1eacfacf538601c18 100644 (file)
--- a/test/functional/old_relation_controller_test.rb
+++ b/test/functional/old_relation_controller_test.rb
@@ -1,22 +1,12 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'old_relation_controller'
 
-# Re-raise errors caught by the controller.
-#class OldRelationController; def rescue_action(e) raise e end; end
-
-class OldRelationControllerTest < Test::Unit::TestCase
+class OldRelationControllerTest < ActionController::TestCase
   api_fixtures
 
-  def setup
-    @controller = OldRelationController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
   # -------------------------------------
   # Test reading old relations.
   # -------------------------------------
-
   def test_history
     # check that a visible relations is returned properly
     get :history, :id => relations(:visible_relation).id