Merge branch 'master' into openstreetbugs

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

diff --git a/test/functional/old_node_controller_test.rb b/test/functional/old_node_controller_test.rb
index ca9a114b154c11f969e96ae6d7ab0ec28c684e47..69ea0f345720a6e1d821c7bde8f5894c21d9e3fc 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'
 
-# 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
 
-  def setup
-    @controller = OldNodeController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
   #
   # TODO: test history
   #
@@ -21,10 +12,14 @@ class OldNodeControllerTest < Test::Unit::TestCase
   # test the version call by submitting several revisions of a new node
   # to the API and ensuring that later calls to version return the 
   # matching versions of the object.
+  #
+  ##
+  # FIXME Move this test to being an integration test since it spans multiple controllers 
   def test_version
+    ## First try this with a non-public user
     basic_authorization(users(:normal_user).email, "test")
     changeset_id = changesets(:normal_user_first_change).id
-
+    
     # setup a simple XML node
     xml_doc = current_nodes(:visible_node).to_xml
     xml_node = xml_doc.find("//osm/node").first
@@ -37,6 +32,57 @@ class OldNodeControllerTest < Test::Unit::TestCase
     # save a version for later checking
     versions[xml_node['version']] = xml_doc.to_s
 
+    # randomly move the node about
+    20.times do 
+      # move the node somewhere else
+      xml_node['lat'] = precision(rand * 180 -  90).to_s
+      xml_node['lon'] = precision(rand * 360 - 180).to_s
+      with_controller(NodeController.new) do
+        content xml_doc
+        put :update, :id => nodeid
+        assert_response :forbidden, "Should have rejected node update"
+        xml_node['version'] = @response.body.to_s
+      end
+      # save a version for later checking
+      versions[xml_node['version']] = xml_doc.to_s
+    end
+
+    # add a bunch of random tags
+    30.times do 
+      xml_tag = XML::Node.new("tag")
+      xml_tag['k'] = random_string
+      xml_tag['v'] = random_string
+      xml_node << xml_tag
+      with_controller(NodeController.new) do
+        content xml_doc
+        put :update, :id => nodeid
+        assert_response :forbidden,
+        "should have rejected node #{nodeid} (#{@response.body}) with forbidden"
+        xml_node['version'] = @response.body.to_s
+      end
+      # save a version for later checking
+      versions[xml_node['version']] = xml_doc.to_s
+    end
+
+    # probably should check that they didn't get written to the database
+
+    
+    ## Now do it with the public user
+    basic_authorization(users(:public_user).email, "test")
+    changeset_id = changesets(:public_user_first_change).id
+
+    # setup a simple XML node
+    xml_doc = current_nodes(:node_with_versions).to_xml
+    xml_node = xml_doc.find("//osm/node").first
+    nodeid = current_nodes(:node_with_versions).id
+
+    # keep a hash of the versions => string, as we'll need something
+    # to test against later
+    versions = Hash.new
+
+    # save a version for later checking
+    versions[xml_node['version']] = xml_doc.to_s
+
     # randomly move the node about
     20.times do 
       # move the node somewhere else
@@ -82,7 +128,19 @@ class OldNodeControllerTest < Test::Unit::TestCase
       assert_nodes_are_equal check_node, api_node
     end
   end
-
+  
+  def test_not_found_version
+    check_not_found_id_version(70000,312344)
+    check_not_found_id_version(-1, -13)
+    check_not_found_id_version(nodes(:visible_node).id, 24354)
+    check_not_found_id_version(24356,   nodes(:visible_node).version)
+  end
+  
+  def check_not_found_id_version(id, version)
+    get :version, :id => id, :version => version
+    assert_response :not_found
+  end
+  
   ##
   # Test that getting the current version is identical to picking
   # that version with the version URI call.
@@ -112,20 +170,6 @@ class OldNodeControllerTest < Test::Unit::TestCase
     assert_nodes_are_equal current_node, old_node
   end
 
-  ##
-  # for some reason a==b is false, but there doesn't seem to be any 
-  # difference between the nodes, so i'm checking all the attributes 
-  # manually and blaming it on ActiveRecord
-  def assert_nodes_are_equal(a, b)
-    assert_equal a.id, b.id, "node IDs"
-    assert_equal a.latitude, b.latitude, "latitude on node #{a.id}"
-    assert_equal a.longitude, b.longitude, "longitude on node #{a.id}"
-    assert_equal a.changeset_id, b.changeset_id, "changeset ID on node #{a.id}"
-    assert_equal a.visible, b.visible, "visible on node #{a.id}"
-    assert_equal a.version, b.version, "version on node #{a.id}"
-    assert_equal a.tags, b.tags, "tags on node #{a.id}"
-  end
-
   ##
   # returns a 16 character long string with some nasty characters in it.
   # this ought to stress-test the tag handling as well as the versioning.
@@ -144,13 +188,4 @@ class OldNodeControllerTest < Test::Unit::TestCase
   def precision(f)
     return (f * GeoRecord::SCALE).round.to_f / GeoRecord::SCALE
   end
-
-  def basic_authorization(user, pass)
-    @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
-  end
-
-  def content(c)
-    @request.env["RAW_POST_DATA"] = c.to_s
-  end
-
 end