Update get/post etc to remove use of deprecated syntax

[rails.git] / test / controllers / way_controller_test.rb

diff --git a/test/controllers/way_controller_test.rb b/test/controllers/way_controller_test.rb
index 42a0413c771f49f329bb70a84c13d8064ca0d327..b93a13759db9f9794abaa852bdb2dd59412f0beb 100644 (file)
--- a/test/controllers/way_controller_test.rb
+++ b/test/controllers/way_controller_test.rb
@@ -2,8 +2,6 @@ require "test_helper"
 require "way_controller"
 
 class WayControllerTest < ActionController::TestCase
 require "way_controller"
 
 class WayControllerTest < ActionController::TestCase

-  api_fixtures
-

   ##
   # test all routes which lead to this controller
   def test_routes
   ##
   # test all routes which lead to this controller
   def test_routes


@@ -39,15 +37,15 @@ class WayControllerTest < ActionController::TestCase
 
   def test_read
     # check that a visible way is returned properly
 
   def test_read
     # check that a visible way is returned properly

-    get :read, :id => create(:way).id
+    get :read, :params => { :id => create(:way).id }

     assert_response :success
 
     # check that an invisible way is not returned
     assert_response :success
 
     # check that an invisible way is not returned

-    get :read, :id => create(:way, :deleted).id
+    get :read, :params => { :id => create(:way, :deleted).id }

     assert_response :gone
 
     # check chat a non-existent way is not returned
     assert_response :gone
 
     # check chat a non-existent way is not returned

-    get :read, :id => 0
+    get :read, :params => { :id => 0 }

     assert_response :not_found
   end
 
     assert_response :not_found
   end
 


@@ -55,7 +53,7 @@ class WayControllerTest < ActionController::TestCase
   # check the "full" mode
   def test_full
     Way.all.each do |way|
   # check the "full" mode
   def test_full
     Way.all.each do |way|

-      get :full, :id => way.id
+      get :full, :params => { :id => way.id }

 
       # full call should say "gone" for non-visible ways...
       unless way.visible
 
       # full call should say "gone" for non-visible ways...
       unless way.visible


@@ -82,27 +80,32 @@ class WayControllerTest < ActionController::TestCase
   ##
   # test fetching multiple ways
   def test_ways
   ##
   # test fetching multiple ways
   def test_ways

+    way1 = create(:way)
+    way2 = create(:way, :deleted)
+    way3 = create(:way)
+    way4 = create(:way)
+

     # check error when no parameter provided
     get :ways
     assert_response :bad_request
 
     # check error when no parameter value provided
     # check error when no parameter provided
     get :ways
     assert_response :bad_request
 
     # check error when no parameter value provided

-    get :ways, :ways => ""
+    get :ways, :params => { :ways => "" }

     assert_response :bad_request
 
     # test a working call
     assert_response :bad_request
 
     # test a working call

-    get :ways, :ways => "1,2,4,6"
+    get :ways, :params => { :ways => "#{way1.id},#{way2.id},#{way3.id},#{way4.id}" }

     assert_response :success
     assert_select "osm" do
       assert_select "way", :count => 4
     assert_response :success
     assert_select "osm" do
       assert_select "way", :count => 4

-      assert_select "way[id='1'][visible='true']", :count => 1
-      assert_select "way[id='2'][visible='false']", :count => 1
-      assert_select "way[id='4'][visible='true']", :count => 1
-      assert_select "way[id='6'][visible='true']", :count => 1
+      assert_select "way[id='#{way1.id}'][visible='true']", :count => 1
+      assert_select "way[id='#{way2.id}'][visible='false']", :count => 1
+      assert_select "way[id='#{way3.id}'][visible='true']", :count => 1
+      assert_select "way[id='#{way4.id}'][visible='true']", :count => 1

     end
 
     # check error when a non-existent way is included
     end
 
     # check error when a non-existent way is included

-    get :ways, :ways => "1,2,4,6,400"
+    get :ways, :params => { :ways => "#{way1.id},#{way2.id},#{way3.id},#{way4.id},400" }

     assert_response :not_found
   end
 
     assert_response :not_found
   end
 


@@ -271,34 +274,34 @@ class WayControllerTest < ActionController::TestCase
     relation = relation_member.relation
 
     # first try to delete way without auth
     relation = relation_member.relation
 
     # first try to delete way without auth

-    delete :delete, :id => way.id
+    delete :delete, :params => { :id => way.id }

     assert_response :unauthorized
 
     # now set auth using the private user
     basic_authorization(private_user.email, "test")
 
     # this shouldn't work as with the 0.6 api we need pay load to delete
     assert_response :unauthorized
 
     # now set auth using the private user
     basic_authorization(private_user.email, "test")
 
     # this shouldn't work as with the 0.6 api we need pay load to delete

-    delete :delete, :id => private_way.id
+    delete :delete, :params => { :id => private_way.id }

     assert_response :forbidden
 
     # Now try without having a changeset
     content "<osm><way id='#{private_way.id}'/></osm>"
     assert_response :forbidden
 
     # Now try without having a changeset
     content "<osm><way id='#{private_way.id}'/></osm>"

-    delete :delete, :id => private_way.id
+    delete :delete, :params => { :id => private_way.id }

     assert_response :forbidden
 
     # try to delete with an invalid (closed) changeset
     content update_changeset(private_way.to_xml, private_closed_changeset.id)
     assert_response :forbidden
 
     # try to delete with an invalid (closed) changeset
     content update_changeset(private_way.to_xml, private_closed_changeset.id)

-    delete :delete, :id => private_way.id
+    delete :delete, :params => { :id => private_way.id }

     assert_response :forbidden
 
     # try to delete with an invalid (non-existent) changeset
     content update_changeset(private_way.to_xml, 0)
     assert_response :forbidden
 
     # try to delete with an invalid (non-existent) changeset
     content update_changeset(private_way.to_xml, 0)

-    delete :delete, :id => private_way.id
+    delete :delete, :params => { :id => private_way.id }

     assert_response :forbidden
 
     # Now try with a valid changeset
     content private_way.to_xml
     assert_response :forbidden
 
     # Now try with a valid changeset
     content private_way.to_xml

-    delete :delete, :id => private_way.id
+    delete :delete, :params => { :id => private_way.id }

     assert_response :forbidden
 
     # check the returned value - should be the new version number
     assert_response :forbidden
 
     # check the returned value - should be the new version number


@@ -309,17 +312,17 @@ class WayControllerTest < ActionController::TestCase
 
     # this won't work since the way is already deleted
     content private_deleted_way.to_xml
 
     # this won't work since the way is already deleted
     content private_deleted_way.to_xml

-    delete :delete, :id => private_deleted_way.id
+    delete :delete, :params => { :id => private_deleted_way.id }

     assert_response :forbidden
 
     # this shouldn't work as the way is used in a relation
     content private_used_way.to_xml
     assert_response :forbidden
 
     # this shouldn't work as the way is used in a relation
     content private_used_way.to_xml

-    delete :delete, :id => private_used_way.id
+    delete :delete, :params => { :id => private_used_way.id }

     assert_response :forbidden,
                     "shouldn't be able to delete a way used in a relation (#{@response.body}), when done by a private user"
 
     # this won't work since the way never existed
     assert_response :forbidden,
                     "shouldn't be able to delete a way used in a relation (#{@response.body}), when done by a private user"
 
     # this won't work since the way never existed

-    delete :delete, :id => 0
+    delete :delete, :params => { :id => 0 }

     assert_response :forbidden
 
     ### Now check with a public user
     assert_response :forbidden
 
     ### Now check with a public user


@@ -327,27 +330,27 @@ class WayControllerTest < ActionController::TestCase
     basic_authorization(user.email, "test")
 
     # this shouldn't work as with the 0.6 api we need pay load to delete
     basic_authorization(user.email, "test")
 
     # this shouldn't work as with the 0.6 api we need pay load to delete

-    delete :delete, :id => way.id
+    delete :delete, :params => { :id => way.id }

     assert_response :bad_request
 
     # Now try without having a changeset
     content "<osm><way id='#{way.id}'/></osm>"
     assert_response :bad_request
 
     # Now try without having a changeset
     content "<osm><way id='#{way.id}'/></osm>"

-    delete :delete, :id => way.id
+    delete :delete, :params => { :id => way.id }

     assert_response :bad_request
 
     # try to delete with an invalid (closed) changeset
     content update_changeset(way.to_xml, closed_changeset.id)
     assert_response :bad_request
 
     # try to delete with an invalid (closed) changeset
     content update_changeset(way.to_xml, closed_changeset.id)

-    delete :delete, :id => way.id
+    delete :delete, :params => { :id => way.id }

     assert_response :conflict
 
     # try to delete with an invalid (non-existent) changeset
     content update_changeset(way.to_xml, 0)
     assert_response :conflict
 
     # try to delete with an invalid (non-existent) changeset
     content update_changeset(way.to_xml, 0)

-    delete :delete, :id => way.id
+    delete :delete, :params => { :id => way.id }

     assert_response :conflict
 
     # Now try with a valid changeset
     content way.to_xml
     assert_response :conflict
 
     # Now try with a valid changeset
     content way.to_xml

-    delete :delete, :id => way.id
+    delete :delete, :params => { :id => way.id }

     assert_response :success
 
     # check the returned value - should be the new version number
     assert_response :success
 
     # check the returned value - should be the new version number


@@ -358,18 +361,18 @@ class WayControllerTest < ActionController::TestCase
 
     # this won't work since the way is already deleted
     content deleted_way.to_xml
 
     # this won't work since the way is already deleted
     content deleted_way.to_xml

-    delete :delete, :id => deleted_way.id
+    delete :delete, :params => { :id => deleted_way.id }

     assert_response :gone
 
     # this shouldn't work as the way is used in a relation
     content used_way.to_xml
     assert_response :gone
 
     # this shouldn't work as the way is used in a relation
     content used_way.to_xml

-    delete :delete, :id => used_way.id
+    delete :delete, :params => { :id => used_way.id }

     assert_response :precondition_failed,
                     "shouldn't be able to delete a way used in a relation (#{@response.body})"
     assert_equal "Precondition failed: Way #{used_way.id} is still used by relations #{relation.id}.", @response.body
 
     # this won't work since the way never existed
     assert_response :precondition_failed,
                     "shouldn't be able to delete a way used in a relation (#{@response.body})"
     assert_equal "Precondition failed: Way #{used_way.id} is still used by relations #{relation.id}.", @response.body
 
     # this won't work since the way never existed

-    delete :delete, :id => 0
+    delete :delete, :params => { :id => 0 }

     assert_response :not_found
   end
 
     assert_response :not_found
   end
 


@@ -388,7 +391,7 @@ class WayControllerTest < ActionController::TestCase
     ## First test with no user credentials
     # try and update a way without authorisation
     content way.to_xml
     ## First test with no user credentials
     # try and update a way without authorisation
     content way.to_xml

-    put :update, :id => way.id
+    put :update, :params => { :id => way.id }

     assert_response :unauthorized
 
     ## Second test with the private user
     assert_response :unauthorized
 
     ## Second test with the private user


@@ -401,32 +404,32 @@ class WayControllerTest < ActionController::TestCase
     # try and update in someone else's changeset
     content update_changeset(private_way.to_xml,
                              create(:changeset).id)
     # try and update in someone else's changeset
     content update_changeset(private_way.to_xml,
                              create(:changeset).id)

-    put :update, :id => private_way.id
+    put :update, :params => { :id => private_way.id }

     assert_require_public_data "update with other user's changeset should be forbidden when date isn't public"
 
     # try and update in a closed changeset
     content update_changeset(private_way.to_xml,
                              create(:changeset, :closed, :user => private_user).id)
     assert_require_public_data "update with other user's changeset should be forbidden when date isn't public"
 
     # try and update in a closed changeset
     content update_changeset(private_way.to_xml,
                              create(:changeset, :closed, :user => private_user).id)

-    put :update, :id => private_way.id
+    put :update, :params => { :id => private_way.id }

     assert_require_public_data "update with closed changeset should be forbidden, when data isn't public"
 
     # try and update in a non-existant changeset
     content update_changeset(private_way.to_xml, 0)
     assert_require_public_data "update with closed changeset should be forbidden, when data isn't public"
 
     # try and update in a non-existant changeset
     content update_changeset(private_way.to_xml, 0)

-    put :update, :id => private_way.id
+    put :update, :params => { :id => private_way.id }

     assert_require_public_data("update with changeset=0 should be forbidden, when data isn't public")
 
     ## try and submit invalid updates
     content xml_replace_node(private_way.to_xml, node.id, 9999)
     assert_require_public_data("update with changeset=0 should be forbidden, when data isn't public")
 
     ## try and submit invalid updates
     content xml_replace_node(private_way.to_xml, node.id, 9999)

-    put :update, :id => private_way.id
+    put :update, :params => { :id => private_way.id }

     assert_require_public_data "way with non-existent node should be forbidden, when data isn't public"
 
     content xml_replace_node(private_way.to_xml, node.id, create(:node, :deleted).id)
     assert_require_public_data "way with non-existent node should be forbidden, when data isn't public"
 
     content xml_replace_node(private_way.to_xml, node.id, create(:node, :deleted).id)

-    put :update, :id => private_way.id
+    put :update, :params => { :id => private_way.id }

     assert_require_public_data "way with deleted node should be forbidden, when data isn't public"
 
     ## finally, produce a good request which will still not work
     content private_way.to_xml
     assert_require_public_data "way with deleted node should be forbidden, when data isn't public"
 
     ## finally, produce a good request which will still not work
     content private_way.to_xml

-    put :update, :id => private_way.id
+    put :update, :params => { :id => private_way.id }

     assert_require_public_data "should have failed with a forbidden when data isn't public"
 
     ## Finally test with the public user
     assert_require_public_data "should have failed with a forbidden when data isn't public"
 
     ## Finally test with the public user


@@ -439,27 +442,27 @@ class WayControllerTest < ActionController::TestCase
     # try and update in someone else's changeset
     content update_changeset(way.to_xml,
                              create(:changeset).id)
     # try and update in someone else's changeset
     content update_changeset(way.to_xml,
                              create(:changeset).id)

-    put :update, :id => way.id
+    put :update, :params => { :id => way.id }

     assert_response :conflict, "update with other user's changeset should be rejected"
 
     # try and update in a closed changeset
     content update_changeset(way.to_xml,
                              create(:changeset, :closed, :user => user).id)
     assert_response :conflict, "update with other user's changeset should be rejected"
 
     # try and update in a closed changeset
     content update_changeset(way.to_xml,
                              create(:changeset, :closed, :user => user).id)

-    put :update, :id => way.id
+    put :update, :params => { :id => way.id }

     assert_response :conflict, "update with closed changeset should be rejected"
 
     # try and update in a non-existant changeset
     content update_changeset(way.to_xml, 0)
     assert_response :conflict, "update with closed changeset should be rejected"
 
     # try and update in a non-existant changeset
     content update_changeset(way.to_xml, 0)

-    put :update, :id => way.id
+    put :update, :params => { :id => way.id }

     assert_response :conflict, "update with changeset=0 should be rejected"
 
     ## try and submit invalid updates
     content xml_replace_node(way.to_xml, node.id, 9999)
     assert_response :conflict, "update with changeset=0 should be rejected"
 
     ## try and submit invalid updates
     content xml_replace_node(way.to_xml, node.id, 9999)

-    put :update, :id => way.id
+    put :update, :params => { :id => way.id }

     assert_response :precondition_failed, "way with non-existent node should be rejected"
 
     content xml_replace_node(way.to_xml, node.id, create(:node, :deleted).id)
     assert_response :precondition_failed, "way with non-existent node should be rejected"
 
     content xml_replace_node(way.to_xml, node.id, create(:node, :deleted).id)

-    put :update, :id => way.id
+    put :update, :params => { :id => way.id }

     assert_response :precondition_failed, "way with deleted node should be rejected"
 
     ## next, attack the versioning
     assert_response :precondition_failed, "way with deleted node should be rejected"
 
     ## next, attack the versioning


@@ -468,37 +471,37 @@ class WayControllerTest < ActionController::TestCase
     # try and submit a version behind
     content xml_attr_rewrite(way.to_xml,
                              "version", current_way_version - 1)
     # try and submit a version behind
     content xml_attr_rewrite(way.to_xml,
                              "version", current_way_version - 1)

-    put :update, :id => way.id
+    put :update, :params => { :id => way.id }

     assert_response :conflict, "should have failed on old version number"
 
     # try and submit a version ahead
     content xml_attr_rewrite(way.to_xml,
                              "version", current_way_version + 1)
     assert_response :conflict, "should have failed on old version number"
 
     # try and submit a version ahead
     content xml_attr_rewrite(way.to_xml,
                              "version", current_way_version + 1)

-    put :update, :id => way.id
+    put :update, :params => { :id => way.id }

     assert_response :conflict, "should have failed on skipped version number"
 
     # try and submit total crap in the version field
     content xml_attr_rewrite(way.to_xml,
                              "version", "p1r4t3s!")
     assert_response :conflict, "should have failed on skipped version number"
 
     # try and submit total crap in the version field
     content xml_attr_rewrite(way.to_xml,
                              "version", "p1r4t3s!")

-    put :update, :id => way.id
+    put :update, :params => { :id => way.id }

     assert_response :conflict,
                     "should not be able to put 'p1r4at3s!' in the version field"
 
     ## try an update with the wrong ID
     content create(:way).to_xml
     assert_response :conflict,
                     "should not be able to put 'p1r4at3s!' in the version field"
 
     ## try an update with the wrong ID
     content create(:way).to_xml

-    put :update, :id => way.id
+    put :update, :params => { :id => way.id }

     assert_response :bad_request,
                     "should not be able to update a way with a different ID from the XML"
 
     ## try an update with a minimal valid XML doc which isn't a well-formed OSM doc.
     content "<update/>"
     assert_response :bad_request,
                     "should not be able to update a way with a different ID from the XML"
 
     ## try an update with a minimal valid XML doc which isn't a well-formed OSM doc.
     content "<update/>"

-    put :update, :id => way.id
+    put :update, :params => { :id => way.id }

     assert_response :bad_request,
                     "should not be able to update a way with non-OSM XML doc."
 
     ## finally, produce a good request which should work
     content way.to_xml
     assert_response :bad_request,
                     "should not be able to update a way with non-OSM XML doc."
 
     ## finally, produce a good request which should work
     content way.to_xml

-    put :update, :id => way.id
+    put :update, :params => { :id => way.id }

     assert_response :success, "a valid update request failed"
   end
 
     assert_response :success, "a valid update request failed"
   end
 


@@ -529,7 +532,7 @@ class WayControllerTest < ActionController::TestCase
 
     # try and upload it
     content way_xml
 
     # try and upload it
     content way_xml

-    put :update, :id => private_way.id
+    put :update, :params => { :id => private_way.id }

     assert_response :forbidden,
                     "adding a duplicate tag to a way for a non-public should fail with 'forbidden'"
 
     assert_response :forbidden,
                     "adding a duplicate tag to a way for a non-public should fail with 'forbidden'"
 


@@ -548,7 +551,7 @@ class WayControllerTest < ActionController::TestCase
 
     # try and upload it
     content way_xml
 
     # try and upload it
     content way_xml

-    put :update, :id => way.id
+    put :update, :params => { :id => way.id }

     assert_response :success,
                     "adding a new tag to a way should succeed"
     assert_equal way.version + 1, @response.body.to_i
     assert_response :success,
                     "adding a new tag to a way should succeed"
     assert_equal way.version + 1, @response.body.to_i


@@ -579,7 +582,7 @@ class WayControllerTest < ActionController::TestCase
 
     # try and upload it
     content way_xml
 
     # try and upload it
     content way_xml

-    put :update, :id => private_way.id
+    put :update, :params => { :id => private_way.id }

     assert_response :forbidden,
                     "adding a duplicate tag to a way for a non-public should fail with 'forbidden'"
 
     assert_response :forbidden,
                     "adding a duplicate tag to a way for a non-public should fail with 'forbidden'"
 


@@ -598,7 +601,7 @@ class WayControllerTest < ActionController::TestCase
 
     # try and upload it
     content way_xml
 
     # try and upload it
     content way_xml

-    put :update, :id => way.id
+    put :update, :params => { :id => way.id }

     assert_response :bad_request,
                     "adding a duplicate tag to a way should fail with 'bad request'"
     assert_equal "Element way/#{way.id} has duplicate tags with key #{existing_tag.k}", @response.body
     assert_response :bad_request,
                     "adding a duplicate tag to a way should fail with 'bad request'"
     assert_equal "Element way/#{way.id} has duplicate tags with key #{existing_tag.k}", @response.body


@@ -629,7 +632,7 @@ class WayControllerTest < ActionController::TestCase
 
     # try and upload it
     content way_xml
 
     # try and upload it
     content way_xml

-    put :update, :id => private_way.id
+    put :update, :params => { :id => private_way.id }

     assert_response :forbidden,
                     "adding new duplicate tags to a way using a non-public user should fail with 'forbidden'"
 
     assert_response :forbidden,
                     "adding new duplicate tags to a way using a non-public user should fail with 'forbidden'"
 


@@ -650,7 +653,7 @@ class WayControllerTest < ActionController::TestCase
 
     # try and upload it
     content way_xml
 
     # try and upload it
     content way_xml

-    put :update, :id => way.id
+    put :update, :params => { :id => way.id }

     assert_response :bad_request,
                     "adding new duplicate tags to a way should fail with 'bad request'"
     assert_equal "Element way/#{way.id} has duplicate tags with key i_am_a_duplicate", @response.body
     assert_response :bad_request,
                     "adding new duplicate tags to a way should fail with 'bad request'"
     assert_equal "Element way/#{way.id} has duplicate tags with key i_am_a_duplicate", @response.body


@@ -716,7 +719,7 @@ class WayControllerTest < ActionController::TestCase
     _way3_v2 = create(:old_way, :current_way => way3_v1.current_way, :version => 2)
     create(:old_way_node, :old_way => way3_v1, :node => node)
 
     _way3_v2 = create(:old_way, :current_way => way3_v1.current_way, :version => 2)
     create(:old_way_node, :old_way => way3_v1, :node => node)
 

-    get :ways_for_node, :id => node.id
+    get :ways_for_node, :params => { :id => node.id }

     assert_response :success
     ways_xml = XML::Parser.string(@response.body).parse
     assert_not_nil ways_xml, "failed to parse ways_for_node response"
     assert_response :success
     ways_xml = XML::Parser.string(@response.body).parse
     assert_not_nil ways_xml, "failed to parse ways_for_node response"