Merge remote-tracking branch 'upstream/pull/5694'

[rails.git] / test / controllers / api / relations_controller_test.rb

diff --git a/test/controllers/api/relations_controller_test.rb b/test/controllers/api/relations_controller_test.rb
index 5e480b69c0b1d02584554a2ba43b9578f444f8c2..f585c5c2cf6dda76c32d2a73e34890f941715d2e 100644 (file)
--- a/test/controllers/api/relations_controller_test.rb
+++ b/test/controllers/api/relations_controller_test.rb
@@ -782,7 +782,7 @@ module Api
 
       # check the ordering in the history tables:
       with_controller(OldRelationsController.new) do
 
       # check the ordering in the history tables:
       with_controller(OldRelationsController.new) do

-        get api_old_relation_path(relation_id, 2)
+        get api_relation_version_path(relation_id, 2)

         assert_response :success, "can't read back version 2 of the relation #{relation_id}"
         check_ordering(doc, @response.body)
       end
         assert_response :success, "can't read back version 2 of the relation #{relation_id}"
         check_ordering(doc, @response.body)
       end


@@ -862,7 +862,7 @@ module Api
 
       # check the ordering in the history tables:
       with_controller(OldRelationsController.new) do
 
       # check the ordering in the history tables:
       with_controller(OldRelationsController.new) do

-        get api_old_relation_path(relation_id, 1)
+        get api_relation_version_path(relation_id, 1)

         assert_response :success, "can't read back version 1 of the relation: #{@response.body}"
         check_ordering(doc, @response.body)
       end
         assert_response :success, "can't read back version 1 of the relation: #{@response.body}"
         check_ordering(doc, @response.body)
       end


@@ -1043,7 +1043,7 @@ module Api
       # that the bounding box will be newly-generated.
       with_controller(Api::ChangesetsController.new) do
         xml = "<osm><changeset/></osm>"
       # that the bounding box will be newly-generated.
       with_controller(Api::ChangesetsController.new) do
         xml = "<osm><changeset/></osm>"

-        put changeset_create_path, :params => xml, :headers => auth_header
+        post api_changesets_path, :params => xml, :headers => auth_header

         assert_response :forbidden, "shouldn't be able to create changeset for modify test, as should get forbidden"
       end
 
         assert_response :forbidden, "shouldn't be able to create changeset for modify test, as should get forbidden"
       end
 


@@ -1054,7 +1054,7 @@ module Api
       # that the bounding box will be newly-generated.
       changeset_id = with_controller(Api::ChangesetsController.new) do
         xml = "<osm><changeset/></osm>"
       # that the bounding box will be newly-generated.
       changeset_id = with_controller(Api::ChangesetsController.new) do
         xml = "<osm><changeset/></osm>"

-        put changeset_create_path, :params => xml, :headers => auth_header
+        post api_changesets_path, :params => xml, :headers => auth_header

         assert_response :success, "couldn't create changeset for modify test"
         @response.body.to_i
       end
         assert_response :success, "couldn't create changeset for modify test"
         @response.body.to_i
       end


@@ -1084,7 +1084,7 @@ module Api
         get api_relation_path(id)
       else
         with_controller(OldRelationsController.new) do
         get api_relation_path(id)
       else
         with_controller(OldRelationsController.new) do

-          get api_old_relation_path(id, ver)
+          get api_relation_version_path(id, ver)

         end
       end
       assert_response :success
         end
       end
       assert_response :success