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

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 }

diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb
index 81dbede570928477d3bab41f73d944d927855165..65e851011abff7a759dd64d1b2be787896158e3d 100644 (file)
--- a/test/functional/browse_controller_test.rb
+++ b/test/functional/browse_controller_test.rb
@@ -1,19 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'browse_controller'
 
 require File.dirname(__FILE__) + '/../test_helper'
 require 'browse_controller'
 

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

   api_fixtures
   api_fixtures

-  
-
-
-  def setup
-    @controller = BrowseController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end

 
   def basic_authorization(user, pass)
     @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
 
   def basic_authorization(user, pass)
     @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")

diff --git a/test/functional/changeset_controller_test.rb b/test/functional/changeset_controller_test.rb
index 848b6d5f58e3a4ca43bad1a044afdbe4f2e994e1..5e26c20716b9b44464e7854e07777d1ff80492ee 100644 (file)
--- a/test/functional/changeset_controller_test.rb
+++ b/test/functional/changeset_controller_test.rb
@@ -1,19 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'changeset_controller'
 
 require File.dirname(__FILE__) + '/../test_helper'
 require 'changeset_controller'
 

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

   api_fixtures
   api_fixtures

-  
-
-
-  def setup
-    @controller = ChangesetController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end

 
   def basic_authorization(user, pass)
     @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
 
   def basic_authorization(user, pass)
     @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")

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

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'
 
 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
 
   # Replace this with your real tests.
   def test_truth

diff --git a/test/functional/node_controller_test.rb b/test/functional/node_controller_test.rb
index dbc00cbb2471e1918a525d3c7b5f8b1000740c47..9e5621f8b324adad189a9731c89af9b9a3141a04 100644 (file)
--- a/test/functional/node_controller_test.rb
+++ b/test/functional/node_controller_test.rb
@@ -1,18 +1,9 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'node_controller'
 
 require File.dirname(__FILE__) + '/../test_helper'
 require 'node_controller'
 

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

   api_fixtures
 
   api_fixtures
 

-  def setup
-    @controller = NodeController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-

   def test_create
     # cannot read password from fixture as it is stored as MD5 digest
     basic_authorization(users(:normal_user).email, "test");
   def test_create
     # cannot read password from fixture as it is stored as MD5 digest
     basic_authorization(users(:normal_user).email, "test");

diff --git a/test/functional/old_node_controller_test.rb b/test/functional/old_node_controller_test.rb
index cdacca52b23a742bc2210df03287fb35e1d31c1b..f1328e65091d7f7c26ac08176284db5efb080108 100644 (file)
--- a/test/functional/old_node_controller_test.rb
+++ b/test/functional/old_node_controller_test.rb
@@ -1,18 +1,9 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'old_node_controller'
 
 require File.dirname(__FILE__) + '/../test_helper'
 require 'old_node_controller'
 

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

   api_fixtures
 
   api_fixtures
 

-  def setup
-    @controller = OldNodeController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-

   #
   # TODO: test history
   #
   #
   # TODO: test history
   #

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'
 
 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
 
   api_fixtures
 

-  def setup
-    @controller = OldRelationController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-

   # -------------------------------------
   # Test reading old relations.
   # -------------------------------------
   # -------------------------------------
   # Test reading old relations.
   # -------------------------------------

-

   def test_history
     # check that a visible relations is returned properly
     get :history, :id => relations(:visible_relation).id
   def test_history
     # check that a visible relations is returned properly
     get :history, :id => relations(:visible_relation).id

diff --git a/test/functional/old_way_controller_test.rb b/test/functional/old_way_controller_test.rb
index c47b45dfcac4af56db4d1cbbf31e748e43ca7c4c..31da1d2c784bb18d6598cbc52a486b77760343d7 100644 (file)
--- a/test/functional/old_way_controller_test.rb
+++ b/test/functional/old_way_controller_test.rb
@@ -1,18 +1,9 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'old_way_controller'
 
 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
 
   api_fixtures
 

-  def setup
-    @controller = OldWayController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-

   # -------------------------------------
   # Test reading old ways.
   # -------------------------------------
   # -------------------------------------
   # Test reading old ways.
   # -------------------------------------

diff --git a/test/functional/relation_controller_test.rb b/test/functional/relation_controller_test.rb
index 1c6439a966bac80fcfeecb5d63a32e872b83c11a..812b35fb17f1c6d34d304aa0d662bdcc15c6638c 100644 (file)
--- a/test/functional/relation_controller_test.rb
+++ b/test/functional/relation_controller_test.rb
@@ -1,18 +1,9 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'relation_controller'
 
 require File.dirname(__FILE__) + '/../test_helper'
 require 'relation_controller'
 

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

   api_fixtures
 
   api_fixtures
 

-  def setup
-    @controller = RelationController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-

   def basic_authorization(user, pass)
     @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
   end
   def basic_authorization(user, pass)
     @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
   end

diff --git a/test/functional/way_controller_test.rb b/test/functional/way_controller_test.rb
index 895e7532fcfb5ebb1e1e11f6ce7df9977e9137f2..19b7fd54c1c2055939ea5e98991af7ca6c81f68a 100644 (file)
--- a/test/functional/way_controller_test.rb
+++ b/test/functional/way_controller_test.rb
@@ -1,18 +1,9 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'way_controller'
 
 require File.dirname(__FILE__) + '/../test_helper'
 require 'way_controller'
 

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

   api_fixtures
 
   api_fixtures
 

-  def setup
-    @controller = WayController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-

   def basic_authorization(user, pass)
     @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
   end
   def basic_authorization(user, pass)
     @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
   end

diff --git a/test/test_helper.rb b/test/test_helper.rb
index a170aed4fba9f08be9372da51e18a778382af3e7..c01c31fca7eac4eb13374c71b6cb519bf42bdad2 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -27,7 +27,7 @@ class Test::Unit::TestCase
 
   # Load standard fixtures needed to test API methods
   def self.api_fixtures
 
   # Load standard fixtures needed to test API methods
   def self.api_fixtures

-    print "setting up the api_fixtures"
+    #print "setting up the api_fixtures"

     fixtures :users, :changesets
 
     fixtures :current_nodes, :nodes
     fixtures :users, :changesets
 
     fixtures :current_nodes, :nodes