Merge branch 'master' into openstreetbugs

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

diff --git a/test/functional/geocoder_controller_test.rb b/test/functional/geocoder_controller_test.rb
index 3faadc7404aab06ec9fb202d3505bb7175d633a5..f63fe518d0aa04925c04f91b2e45ad905f145013 100644 (file)
--- a/test/functional/geocoder_controller_test.rb
+++ b/test/functional/geocoder_controller_test.rb
@@ -1,15 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'geocoder_controller'
 
 require File.dirname(__FILE__) + '/../test_helper'
 require 'geocoder_controller'
 

-# Re-raise errors caught by the controller.
-class GeocoderController; def rescue_action(e) raise e end; end
-
-class GeocoderControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = GeocoderController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
+class GeocoderControllerTest < ActionController::TestCase

 
   # Replace this with your real tests.
   def test_truth
 
   # Replace this with your real tests.
   def test_truth