X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9a9b045372a6f48420a9a6dacfde52c34ab7abce..d7063ab0a9db4cb833e89c5cde08c005b7940c9a:/test/controllers/way_controller_test.rb

diff --git a/test/controllers/way_controller_test.rb b/test/controllers/way_controller_test.rb
index 8226f435c..3d466de8b 100644
--- 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
-  api_fixtures
-
   ##
   # 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
-    get :read, :id => current_ways(:visible_way).id
+    get :read, :params => { :id => create(:way).id }
     assert_response :success
 
     # check that an invisible way is not returned
-    get :read, :id => current_ways(:invisible_way).id
+    get :read, :params => { :id => create(:way, :deleted).id }
     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
 
@@ -55,7 +53,7 @@ class WayControllerTest < ActionController::TestCase
   # 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
@@ -74,7 +72,7 @@ class WayControllerTest < ActionController::TestCase
       way.nodes.each do |n|
         count = (way.nodes - (way.nodes - [n])).length
         assert_select "osm way nd[ref='#{n.id}']", count
-        assert_select "osm node[id='#{n.id}'][version='#{n.version}'][lat='#{n.lat}'][lon='#{n.lon}']", 1
+        assert_select "osm node[id='#{n.id}'][version='#{n.version}'][lat='#{format('%.7f', n.lat)}'][lon='#{format('%.7f', n.lon)}']", 1
       end
     end
   end
@@ -82,27 +80,32 @@ class WayControllerTest < ActionController::TestCase
   ##
   # 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
-    get :ways, :ways => ""
+    get :ways, :params => { :ways => "" }
     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_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
-    get :ways, :ways => "1,2,4,6,400"
+    get :ways, :params => { :ways => "#{way1.id},#{way2.id},#{way3.id},#{way4.id},0" }
     assert_response :not_found
   end
 
@@ -111,35 +114,38 @@ class WayControllerTest < ActionController::TestCase
   # -------------------------------------
 
   def test_create
+    node1 = create(:node)
+    node2 = create(:node)
+    private_user = create(:user, :data_public => false)
+    private_changeset = create(:changeset, :user => private_user)
+    user = create(:user)
+    changeset = create(:changeset, :user => user)
+
     ## First check that it fails when creating a way using a non-public user
-    nid1 = current_nodes(:used_node_1).id
-    nid2 = current_nodes(:used_node_2).id
-    basic_authorization users(:normal_user).email, "test"
+    basic_authorization private_user.email, "test"
 
     # use the first user's open changeset
-    changeset_id = changesets(:normal_user_first_change).id
+    changeset_id = private_changeset.id
 
     # create a way with pre-existing nodes
-    content "<osm><way changeset='#{changeset_id}'>" +
-      "<nd ref='#{nid1}'/><nd ref='#{nid2}'/>" +
-      "<tag k='test' v='yes' /></way></osm>"
+    content "<osm><way changeset='#{changeset_id}'>" \
+            "<nd ref='#{node1.id}'/><nd ref='#{node2.id}'/>" \
+            "<tag k='test' v='yes' /></way></osm>"
     put :create
     # hope for failure
     assert_response :forbidden,
                     "way upload did not return forbidden status"
 
     ## Now use a public user
-    nid1 = current_nodes(:used_node_1).id
-    nid2 = current_nodes(:used_node_2).id
-    basic_authorization users(:public_user).email, "test"
+    basic_authorization user.email, "test"
 
     # use the first user's open changeset
-    changeset_id = changesets(:public_user_first_change).id
+    changeset_id = changeset.id
 
     # create a way with pre-existing nodes
-    content "<osm><way changeset='#{changeset_id}'>" +
-      "<nd ref='#{nid1}'/><nd ref='#{nid2}'/>" +
-      "<tag k='test' v='yes' /></way></osm>"
+    content "<osm><way changeset='#{changeset_id}'>" \
+            "<nd ref='#{node1.id}'/><nd ref='#{node2.id}'/>" \
+            "<tag k='test' v='yes' /></way></osm>"
     put :create
     # hope for success
     assert_response :success,
@@ -152,13 +158,13 @@ class WayControllerTest < ActionController::TestCase
     # compare values
     assert_equal checkway.nds.length, 2,
                  "saved way does not contain exactly one node"
-    assert_equal checkway.nds[0], nid1,
+    assert_equal checkway.nds[0], node1.id,
                  "saved way does not contain the right node on pos 0"
-    assert_equal checkway.nds[1], nid2,
+    assert_equal checkway.nds[1], node2.id,
                  "saved way does not contain the right node on pos 1"
     assert_equal checkway.changeset_id, changeset_id,
                  "saved way does not belong to the correct changeset"
-    assert_equal users(:public_user).id, checkway.changeset.user_id,
+    assert_equal user.id, checkway.changeset.user_id,
                  "saved way does not belong to user that created it"
     assert_equal true, checkway.visible,
                  "saved way is not visible"
@@ -169,49 +175,49 @@ class WayControllerTest < ActionController::TestCase
   # -------------------------------------
 
   def test_create_invalid
+    node = create(:node)
+    private_user = create(:user, :data_public => false)
+    private_open_changeset = create(:changeset, :user => private_user)
+    private_closed_changeset = create(:changeset, :closed, :user => private_user)
+    user = create(:user)
+    open_changeset = create(:changeset, :user => user)
+    closed_changeset = create(:changeset, :closed, :user => user)
+
     ## First test with a private user to make sure that they are not authorized
-    basic_authorization users(:normal_user).email, "test"
+    basic_authorization private_user.email, "test"
 
     # use the first user's open changeset
-    open_changeset_id = changesets(:normal_user_first_change).id
-    closed_changeset_id = changesets(:normal_user_closed_change).id
-    nid1 = current_nodes(:used_node_1).id
-
     # create a way with non-existing node
-    content "<osm><way changeset='#{open_changeset_id}'>" +
-      "<nd ref='0'/><tag k='test' v='yes' /></way></osm>"
+    content "<osm><way changeset='#{private_open_changeset.id}'>" \
+            "<nd ref='0'/><tag k='test' v='yes' /></way></osm>"
     put :create
     # expect failure
     assert_response :forbidden,
                     "way upload with invalid node using a private user did not return 'forbidden'"
 
     # create a way with no nodes
-    content "<osm><way changeset='#{open_changeset_id}'>" +
-      "<tag k='test' v='yes' /></way></osm>"
+    content "<osm><way changeset='#{private_open_changeset.id}'>" \
+            "<tag k='test' v='yes' /></way></osm>"
     put :create
     # expect failure
     assert_response :forbidden,
                     "way upload with no node using a private userdid not return 'forbidden'"
 
     # create a way inside a closed changeset
-    content "<osm><way changeset='#{closed_changeset_id}'>" +
-      "<nd ref='#{nid1}'/></way></osm>"
+    content "<osm><way changeset='#{private_closed_changeset.id}'>" \
+            "<nd ref='#{node.id}'/></way></osm>"
     put :create
     # expect failure
     assert_response :forbidden,
                     "way upload to closed changeset with a private user did not return 'forbidden'"
 
     ## Now test with a public user
-    basic_authorization users(:public_user).email, "test"
+    basic_authorization user.email, "test"
 
     # use the first user's open changeset
-    open_changeset_id = changesets(:public_user_first_change).id
-    closed_changeset_id = changesets(:public_user_closed_change).id
-    nid1 = current_nodes(:used_node_1).id
-
     # create a way with non-existing node
-    content "<osm><way changeset='#{open_changeset_id}'>" +
-      "<nd ref='0'/><tag k='test' v='yes' /></way></osm>"
+    content "<osm><way changeset='#{open_changeset.id}'>" \
+            "<nd ref='0'/><tag k='test' v='yes' /></way></osm>"
     put :create
     # expect failure
     assert_response :precondition_failed,
@@ -219,8 +225,8 @@ class WayControllerTest < ActionController::TestCase
     assert_equal "Precondition failed: Way  requires the nodes with id in (0), which either do not exist, or are not visible.", @response.body
 
     # create a way with no nodes
-    content "<osm><way changeset='#{open_changeset_id}'>" +
-      "<tag k='test' v='yes' /></way></osm>"
+    content "<osm><way changeset='#{open_changeset.id}'>" \
+            "<tag k='test' v='yes' /></way></osm>"
     put :create
     # expect failure
     assert_response :precondition_failed,
@@ -228,18 +234,18 @@ class WayControllerTest < ActionController::TestCase
     assert_equal "Precondition failed: Cannot create way: data is invalid.", @response.body
 
     # create a way inside a closed changeset
-    content "<osm><way changeset='#{closed_changeset_id}'>" +
-      "<nd ref='#{nid1}'/></way></osm>"
+    content "<osm><way changeset='#{closed_changeset.id}'>" \
+            "<nd ref='#{node.id}'/></way></osm>"
     put :create
     # expect failure
     assert_response :conflict,
                     "way upload to closed changeset did not return 'conflict'"
 
     # create a way with a tag which is too long
-    content "<osm><way changeset='#{open_changeset_id}'>" +
-      "<nd ref='#{nid1}'/>" +
-      "<tag k='foo' v='#{'x' * 256}'/>" +
-      "</way></osm>"
+    content "<osm><way changeset='#{open_changeset.id}'>" \
+            "<nd ref='#{node.id}'/>" \
+            "<tag k='foo' v='#{'x' * 256}'/>" \
+            "</way></osm>"
     put :create
     # expect failure
     assert_response :bad_request,
@@ -251,36 +257,51 @@ class WayControllerTest < ActionController::TestCase
   # -------------------------------------
 
   def test_delete
+    private_user = create(:user, :data_public => false)
+    private_open_changeset = create(:changeset, :user => private_user)
+    private_closed_changeset = create(:changeset, :closed, :user => private_user)
+    private_way = create(:way, :changeset => private_open_changeset)
+    private_deleted_way = create(:way, :deleted, :changeset => private_open_changeset)
+    private_used_way = create(:way, :changeset => private_open_changeset)
+    create(:relation_member, :member => private_used_way)
+    user = create(:user)
+    open_changeset = create(:changeset, :user => user)
+    closed_changeset = create(:changeset, :closed, :user => user)
+    way = create(:way, :changeset => open_changeset)
+    deleted_way = create(:way, :deleted, :changeset => open_changeset)
+    used_way = create(:way, :changeset => open_changeset)
+    relation_member = create(:relation_member, :member => used_way)
+    relation = relation_member.relation
+
     # first try to delete way without auth
-    delete :delete, :id => current_ways(:visible_way).id
+    delete :delete, :params => { :id => way.id }
     assert_response :unauthorized
 
     # now set auth using the private user
-    basic_authorization(users(:normal_user).email, "test")
+    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 => current_ways(:visible_way).id
+    delete :delete, :params => { :id => private_way.id }
     assert_response :forbidden
 
     # Now try without having a changeset
-    content "<osm><way id='#{current_ways(:visible_way).id}'/></osm>"
-    delete :delete, :id => current_ways(:visible_way).id
+    content "<osm><way id='#{private_way.id}'/></osm>"
+    delete :delete, :params => { :id => private_way.id }
     assert_response :forbidden
 
     # try to delete with an invalid (closed) changeset
-    content update_changeset(current_ways(:visible_way).to_xml,
-                             changesets(:normal_user_closed_change).id)
-    delete :delete, :id => current_ways(:visible_way).id
+    content update_changeset(private_way.to_xml, private_closed_changeset.id)
+    delete :delete, :params => { :id => private_way.id }
     assert_response :forbidden
 
     # try to delete with an invalid (non-existent) changeset
-    content update_changeset(current_ways(:visible_way).to_xml, 0)
-    delete :delete, :id => current_ways(:visible_way).id
+    content update_changeset(private_way.to_xml, 0)
+    delete :delete, :params => { :id => private_way.id }
     assert_response :forbidden
 
     # Now try with a valid changeset
-    content current_ways(:visible_way).to_xml
-    delete :delete, :id => current_ways(:visible_way).id
+    content private_way.to_xml
+    delete :delete, :params => { :id => private_way.id }
     assert_response :forbidden
 
     # check the returned value - should be the new version number
@@ -290,69 +311,68 @@ class WayControllerTest < ActionController::TestCase
     #   "delete request should return a new version number for way"
 
     # this won't work since the way is already deleted
-    content current_ways(:invisible_way).to_xml
-    delete :delete, :id => current_ways(:invisible_way).id
+    content private_deleted_way.to_xml
+    delete :delete, :params => { :id => private_deleted_way.id }
     assert_response :forbidden
 
     # this shouldn't work as the way is used in a relation
-    content current_ways(:used_way).to_xml
-    delete :delete, :id => current_ways(:used_way).id
+    content private_used_way.to_xml
+    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
-    delete :delete, :id => 0
+    delete :delete, :params => { :id => 0 }
     assert_response :forbidden
 
     ### Now check with a public user
     # now set auth
-    basic_authorization(users(:public_user).email, "test")
+    basic_authorization user.email, "test"
 
     # this shouldn't work as with the 0.6 api we need pay load to delete
-    delete :delete, :id => current_ways(:visible_way).id
+    delete :delete, :params => { :id => way.id }
     assert_response :bad_request
 
     # Now try without having a changeset
-    content "<osm><way id='#{current_ways(:visible_way).id}'/></osm>"
-    delete :delete, :id => current_ways(:visible_way).id
+    content "<osm><way id='#{way.id}'/></osm>"
+    delete :delete, :params => { :id => way.id }
     assert_response :bad_request
 
     # try to delete with an invalid (closed) changeset
-    content update_changeset(current_ways(:visible_way).to_xml,
-                             changesets(:public_user_closed_change).id)
-    delete :delete, :id => current_ways(:visible_way).id
+    content update_changeset(way.to_xml, closed_changeset.id)
+    delete :delete, :params => { :id => way.id }
     assert_response :conflict
 
     # try to delete with an invalid (non-existent) changeset
-    content update_changeset(current_ways(:visible_way).to_xml, 0)
-    delete :delete, :id => current_ways(:visible_way).id
+    content update_changeset(way.to_xml, 0)
+    delete :delete, :params => { :id => way.id }
     assert_response :conflict
 
     # Now try with a valid changeset
-    content current_ways(:visible_way).to_xml
-    delete :delete, :id => current_ways(:visible_way).id
+    content way.to_xml
+    delete :delete, :params => { :id => way.id }
     assert_response :success
 
     # check the returned value - should be the new version number
     # valid delete should return the new version number, which should
     # be greater than the old version number
-    assert @response.body.to_i > current_ways(:visible_way).version,
+    assert @response.body.to_i > way.version,
            "delete request should return a new version number for way"
 
     # this won't work since the way is already deleted
-    content current_ways(:invisible_way).to_xml
-    delete :delete, :id => current_ways(:invisible_way).id
+    content deleted_way.to_xml
+    delete :delete, :params => { :id => deleted_way.id }
     assert_response :gone
 
     # this shouldn't work as the way is used in a relation
-    content current_ways(:used_way).to_xml
-    delete :delete, :id => current_ways(:used_way).id
+    content used_way.to_xml
+    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 3 is still used by relations 1.", @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
 
@@ -360,127 +380,128 @@ class WayControllerTest < ActionController::TestCase
   # tests whether the API works and prevents incorrect use while trying
   # to update ways.
   def test_update
+    private_user = create(:user, :data_public => false)
+    private_way = create(:way, :changeset => create(:changeset, :user => private_user))
+    user = create(:user)
+    way = create(:way, :changeset => create(:changeset, :user => user))
+    node = create(:node)
+    create(:way_node, :way => private_way, :node => node)
+    create(:way_node, :way => way, :node => node)
+
     ## First test with no user credentials
     # try and update a way without authorisation
-    # first try to delete way without auth
-    content current_ways(:visible_way).to_xml
-    put :update, :id => current_ways(:visible_way).id
+    content way.to_xml
+    put :update, :params => { :id => way.id }
     assert_response :unauthorized
 
     ## Second test with the private user
 
     # setup auth
-    basic_authorization(users(:normal_user).email, "test")
+    basic_authorization private_user.email, "test"
 
     ## trying to break changesets
 
     # try and update in someone else's changeset
-    content update_changeset(current_ways(:visible_way).to_xml,
-                             changesets(:public_user_first_change).id)
-    put :update, :id => current_ways(:visible_way).id
+    content update_changeset(private_way.to_xml,
+                             create(:changeset).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(current_ways(:visible_way).to_xml,
-                             changesets(:normal_user_closed_change).id)
-    put :update, :id => current_ways(:visible_way).id
+    content update_changeset(private_way.to_xml,
+                             create(:changeset, :closed, :user => private_user).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(current_ways(:visible_way).to_xml, 0)
-    put :update, :id => current_ways(:visible_way).id
+    content update_changeset(private_way.to_xml, 0)
+    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(current_ways(:visible_way).to_xml, 3, 9999)
-    put :update, :id => current_ways(:visible_way).id
+    content xml_replace_node(private_way.to_xml, node.id, 9999)
+    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(current_ways(:visible_way).to_xml, 3, current_nodes(:invisible_node).id)
-    put :update, :id => current_ways(:visible_way).id
+    content xml_replace_node(private_way.to_xml, node.id, create(:node, :deleted).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 should work
-    content current_ways(:visible_way).to_xml
-    put :update, :id => current_ways(:visible_way).id
+    ## finally, produce a good request which will still not work
+    content private_way.to_xml
+    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
 
-    # try and update a way without authorisation
-    # first try to delete way without auth
-    content current_ways(:visible_way).to_xml
-    put :update, :id => current_ways(:visible_way).id
-    assert_response :forbidden
-
     # setup auth
-    basic_authorization(users(:public_user).email, "test")
+    basic_authorization user.email, "test"
 
     ## trying to break changesets
 
     # try and update in someone else's changeset
-    content update_changeset(current_ways(:visible_way).to_xml,
-                             changesets(:normal_user_first_change).id)
-    put :update, :id => current_ways(:visible_way).id
+    content update_changeset(way.to_xml,
+                             create(:changeset).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(current_ways(:visible_way).to_xml,
-                             changesets(:normal_user_closed_change).id)
-    put :update, :id => current_ways(:visible_way).id
+    content update_changeset(way.to_xml,
+                             create(:changeset, :closed, :user => user).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(current_ways(:visible_way).to_xml, 0)
-    put :update, :id => current_ways(:visible_way).id
+    content update_changeset(way.to_xml, 0)
+    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(current_ways(:visible_way).to_xml, 3, 9999)
-    put :update, :id => current_ways(:visible_way).id
+    content xml_replace_node(way.to_xml, node.id, 9999)
+    put :update, :params => { :id => way.id }
     assert_response :precondition_failed, "way with non-existent node should be rejected"
 
-    content xml_replace_node(current_ways(:visible_way).to_xml, 3, current_nodes(:invisible_node).id)
-    put :update, :id => current_ways(:visible_way).id
+    content xml_replace_node(way.to_xml, node.id, create(:node, :deleted).id)
+    put :update, :params => { :id => way.id }
     assert_response :precondition_failed, "way with deleted node should be rejected"
 
     ## next, attack the versioning
-    current_way_version = current_ways(:visible_way).version
+    current_way_version = way.version
 
     # try and submit a version behind
-    content xml_attr_rewrite(current_ways(:visible_way).to_xml,
+    content xml_attr_rewrite(way.to_xml,
                              "version", current_way_version - 1)
-    put :update, :id => current_ways(:visible_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(current_ways(:visible_way).to_xml,
+    content xml_attr_rewrite(way.to_xml,
                              "version", current_way_version + 1)
-    put :update, :id => current_ways(:visible_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(current_ways(:visible_way).to_xml,
+    content xml_attr_rewrite(way.to_xml,
                              "version", "p1r4t3s!")
-    put :update, :id => current_ways(:visible_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 current_ways(:used_way).to_xml
-    put :update, :id => current_ways(:visible_way).id
+    content create(:way).to_xml
+    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/>"
-    put :update, :id => current_ways(:visible_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 current_ways(:visible_way).to_xml
-    put :update, :id => current_ways(:visible_way).id
+    content way.to_xml
+    put :update, :params => { :id => way.id }
     assert_response :success, "a valid update request failed"
   end
 
@@ -491,9 +512,14 @@ class WayControllerTest < ActionController::TestCase
   ##
   # Try adding a new tag to a way
   def test_add_tags
+    private_user = create(:user, :data_public => false)
+    private_way = create(:way_with_nodes, :nodes_count => 2, :changeset => create(:changeset, :user => private_user))
+    user = create(:user)
+    way = create(:way_with_nodes, :nodes_count => 2, :changeset => create(:changeset, :user => user))
+
     ## Try with the non-public user
     # setup auth
-    basic_authorization(users(:normal_user).email, "test")
+    basic_authorization private_user.email, "test"
 
     # add an identical tag to the way
     tag_xml = XML::Node.new("tag")
@@ -501,18 +527,18 @@ class WayControllerTest < ActionController::TestCase
     tag_xml["v"] = "yes"
 
     # add the tag into the existing xml
-    way_xml = current_ways(:visible_way).to_xml
+    way_xml = private_way.to_xml
     way_xml.find("//osm/way").first << tag_xml
 
     # try and upload it
     content way_xml
-    put :update, :id => current_ways(:visible_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'"
 
     ## Now try with the public user
     # setup auth
-    basic_authorization(users(:public_user).email, "test")
+    basic_authorization user.email, "test"
 
     # add an identical tag to the way
     tag_xml = XML::Node.new("tag")
@@ -520,66 +546,78 @@ class WayControllerTest < ActionController::TestCase
     tag_xml["v"] = "yes"
 
     # add the tag into the existing xml
-    way_xml = current_ways(:visible_way).to_xml
+    way_xml = way.to_xml
     way_xml.find("//osm/way").first << tag_xml
 
     # try and upload it
     content way_xml
-    put :update, :id => current_ways(:visible_way).id
+    put :update, :params => { :id => way.id }
     assert_response :success,
                     "adding a new tag to a way should succeed"
-    assert_equal current_ways(:visible_way).version + 1, @response.body.to_i
+    assert_equal way.version + 1, @response.body.to_i
   end
 
   ##
   # Try adding a duplicate of an existing tag to a way
   def test_add_duplicate_tags
+    private_user = create(:user, :data_public => false)
+    private_way = create(:way, :changeset => create(:changeset, :user => private_user))
+    private_existing_tag = create(:way_tag, :way => private_way)
+    user = create(:user)
+    way = create(:way, :changeset => create(:changeset, :user => user))
+    existing_tag = create(:way_tag, :way => way)
+
     ## Try with the non-public user
     # setup auth
-    basic_authorization(users(:normal_user).email, "test")
+    basic_authorization private_user.email, "test"
 
     # add an identical tag to the way
     tag_xml = XML::Node.new("tag")
-    tag_xml["k"] = current_way_tags(:t1).k
-    tag_xml["v"] = current_way_tags(:t1).v
+    tag_xml["k"] = private_existing_tag.k
+    tag_xml["v"] = private_existing_tag.v
 
     # add the tag into the existing xml
-    way_xml = current_ways(:visible_way).to_xml
+    way_xml = private_way.to_xml
     way_xml.find("//osm/way").first << tag_xml
 
     # try and upload it
     content way_xml
-    put :update, :id => current_ways(:visible_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'"
 
     ## Now try with the public user
     # setup auth
-    basic_authorization(users(:public_user).email, "test")
+    basic_authorization user.email, "test"
 
     # add an identical tag to the way
     tag_xml = XML::Node.new("tag")
-    tag_xml["k"] = current_way_tags(:t1).k
-    tag_xml["v"] = current_way_tags(:t1).v
+    tag_xml["k"] = existing_tag.k
+    tag_xml["v"] = existing_tag.v
 
     # add the tag into the existing xml
-    way_xml = current_ways(:visible_way).to_xml
+    way_xml = way.to_xml
     way_xml.find("//osm/way").first << tag_xml
 
     # try and upload it
     content way_xml
-    put :update, :id => current_ways(:visible_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/#{current_ways(:visible_way).id} has duplicate tags with key #{current_way_tags(:t1).k}", @response.body
+    assert_equal "Element way/#{way.id} has duplicate tags with key #{existing_tag.k}", @response.body
   end
 
   ##
   # Try adding a new duplicate tags to a way
   def test_new_duplicate_tags
+    private_user = create(:user, :data_public => false)
+    private_way = create(:way, :changeset => create(:changeset, :user => private_user))
+    user = create(:user)
+    way = create(:way, :changeset => create(:changeset, :user => user))
+
     ## First test with the non-public user so should be rejected
     # setup auth
-    basic_authorization(users(:normal_user).email, "test")
+    basic_authorization private_user.email, "test"
 
     # create duplicate tag
     tag_xml = XML::Node.new("tag")
@@ -587,20 +625,20 @@ class WayControllerTest < ActionController::TestCase
     tag_xml["v"] = "foobar"
 
     # add the tag into the existing xml
-    way_xml = current_ways(:visible_way).to_xml
+    way_xml = private_way.to_xml
 
     # add two copies of the tag
     way_xml.find("//osm/way").first << tag_xml.copy(true) << tag_xml
 
     # try and upload it
     content way_xml
-    put :update, :id => current_ways(:visible_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'"
 
     ## Now test with the public user
     # setup auth
-    basic_authorization(users(:public_user).email, "test")
+    basic_authorization user.email, "test"
 
     # create duplicate tag
     tag_xml = XML::Node.new("tag")
@@ -608,17 +646,17 @@ class WayControllerTest < ActionController::TestCase
     tag_xml["v"] = "foobar"
 
     # add the tag into the existing xml
-    way_xml = current_ways(:visible_way).to_xml
+    way_xml = way.to_xml
 
     # add two copies of the tag
     way_xml.find("//osm/way").first << tag_xml.copy(true) << tag_xml
 
     # try and upload it
     content way_xml
-    put :update, :id => current_ways(:visible_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/#{current_ways(:visible_way).id} has duplicate tags with key i_am_a_duplicate", @response.body
+    assert_equal "Element way/#{way.id} has duplicate tags with key i_am_a_duplicate", @response.body
   end
 
   ##
@@ -626,12 +664,17 @@ class WayControllerTest < ActionController::TestCase
   # But be a bit subtle - use unicode decoding ambiguities to use different
   # binary strings which have the same decoding.
   def test_invalid_duplicate_tags
+    private_user = create(:user, :data_public => false)
+    private_changeset = create(:changeset, :user => private_user)
+    user = create(:user)
+    changeset = create(:changeset, :user => user)
+
     ## First make sure that you can't with a non-public user
     # setup auth
-    basic_authorization(users(:normal_user).email, "test")
+    basic_authorization private_user.email, "test"
 
     # add the tag into the existing xml
-    way_str = "<osm><way changeset='1'>"
+    way_str = "<osm><way changeset='#{private_changeset.id}'>"
     way_str << "<tag k='addr:housenumber' v='1'/>"
     way_str << "<tag k='addr:housenumber' v='2'/>"
     way_str << "</way></osm>"
@@ -644,10 +687,10 @@ class WayControllerTest < ActionController::TestCase
 
     ## Now do it with a public user
     # setup auth
-    basic_authorization(users(:public_user).email, "test")
+    basic_authorization user.email, "test"
 
     # add the tag into the existing xml
-    way_str = "<osm><way changeset='1'>"
+    way_str = "<osm><way changeset='#{changeset.id}'>"
     way_str << "<tag k='addr:housenumber' v='1'/>"
     way_str << "<tag k='addr:housenumber' v='2'/>"
     way_str << "</way></osm>"
@@ -664,20 +707,29 @@ class WayControllerTest < ActionController::TestCase
   # test that a call to ways_for_node returns all ways that contain the node
   # and none that don't.
   def test_ways_for_node
-    # in current fixtures ways 1 and 3 all use node 3. ways 2 and 4
-    # *used* to use it but doesn't.
-    get :ways_for_node, :id => current_nodes(:used_node_1).id
+    node = create(:node)
+    way1 = create(:way)
+    way2 = create(:way)
+    create(:way_node, :way => way1, :node => node)
+    create(:way_node, :way => way2, :node => node)
+    # create an unrelated way
+    create(:way_with_nodes, :nodes_count => 2)
+    # create a way which used to use the node
+    way3_v1 = create(:old_way, :version => 1)
+    _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, :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"
 
     # check that the set of IDs match expectations
-    expected_way_ids = [current_ways(:visible_way).id,
-                        current_ways(:used_way).id
-                       ]
+    expected_way_ids = [way1.id,
+                        way2.id]
     found_way_ids = ways_xml.find("//osm/way").collect { |w| w["id"].to_i }
     assert_equal expected_way_ids.sort, found_way_ids.sort,
-                 "expected ways for node #{current_nodes(:used_node_1).id} did not match found"
+                 "expected ways for node #{node.id} did not match found"
 
     # check the full ways to ensure we're not missing anything
     expected_way_ids.each do |id|