Moving all the functional tests to the Rails 2 way, which uses less code by having...

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

diff --git a/test/functional/api_controller_test.rb b/test/functional/api_controller_test.rb
index 0ee49517f731925a1eeef86e730d8541e8e28596..b6bd2bf1dfa606ef3ded71386228244c97748178 100644 (file)
--- a/test/functional/api_controller_test.rb
+++ b/test/functional/api_controller_test.rb
@@ -1,16 +1,11 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'api_controller'
 
 require File.dirname(__FILE__) + '/../test_helper'
 require 'api_controller'
 

-# Re-raise errors caught by the controller.
-class ApiController; def rescue_action(e) raise e end; end
-
-class ApiControllerTest < Test::Unit::TestCase
+class ApiControllerTest < ActionController::TestCase

   api_fixtures
   
   def setup
   api_fixtures
   
   def setup

-    @controller = ApiController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
+    super

     @badbigbbox = %w{ -0.1,-0.1,1.1,1.1  10,10,11,11 }
     @badmalformedbbox = %w{ -0.1  hello 
     10N2W10.1N2.1W }
     @badbigbbox = %w{ -0.1,-0.1,1.1,1.1  10,10,11,11 }
     @badmalformedbbox = %w{ -0.1  hello 
     10N2W10.1N2.1W }