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

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

diff --git a/test/controllers/amf_controller_test.rb b/test/controllers/amf_controller_test.rb
index f92be48656aa37f38bfa5eef20b929b1cd03ca0e..0fb20fab1f01e9a9b09522bd6dbc6400fb660f22 100644 (file)
--- a/test/controllers/amf_controller_test.rb
+++ b/test/controllers/amf_controller_test.rb
@@ -1,9 +1,7 @@
 require "test_helper"
 require "test_helper"

-require "stringio"
-include Potlatch

 
 class AmfControllerTest < ActionController::TestCase
 
 class AmfControllerTest < ActionController::TestCase

-  api_fixtures
+  include Potlatch

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


@@ -19,11 +17,10 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_getpresets
   end
 
   def test_getpresets

-    user_en_de = create(:user, :languages => %w(en de))
-    user_de = create(:user, :languages => %w(de))
+    user_en_de = create(:user, :languages => %w[en de])
+    user_de = create(:user, :languages => %w[de])

     [user_en_de, user_de].each do |user|
     [user_en_de, user_de].each do |user|

-      amf_content "getpresets", "/1", ["#{user.email}:test", ""]
-      post :amf_read
+      post :amf_read, :body => amf_content("getpresets", "/1", ["#{user.email}:test", ""])

       assert_response :success
       amf_parse_response
       presets = amf_result("/1")
       assert_response :success
       amf_parse_response
       presets = amf_result("/1")


@@ -47,97 +44,109 @@ class AmfControllerTest < ActionController::TestCase
 
   def test_getway
     # check a visible way
 
   def test_getway
     # check a visible way

-    id = current_ways(:visible_way).id
-    amf_content "getway", "/1", [id]
-    post :amf_read
+    way = create(:way_with_nodes, :nodes_count => 1)
+    node = way.nodes.first
+    user = way.changeset.user
+
+    post :amf_read, :body => amf_content("getway", "/1", [way.id])

     assert_response :success
     amf_parse_response
     assert_response :success
     amf_parse_response

-    way = amf_result("/1")
-    assert_equal 0, way[0]
-    assert_equal "", way[1]
-    assert_equal id, way[2]
-    assert_equal 1, way[3].length
-    assert_equal 3, way[3][0][2]
-    assert_equal 1, way[5]
-    assert_equal 2, way[6]
+    result = amf_result("/1")
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+    assert_equal way.id, result[2]
+    assert_equal 1, result[3].length
+    assert_equal node.id, result[3][0][2]
+    assert_equal way.version, result[5]
+    assert_equal user.id, result[6]

   end
 
   def test_getway_invisible
     # check an invisible way
   end
 
   def test_getway_invisible
     # check an invisible way

-    id = current_ways(:invisible_way).id
-    amf_content "getway", "/1", [id]
-    post :amf_read
+    id = create(:way, :deleted).id
+
+    post :amf_read, :body => amf_content("getway", "/1", [id])

     assert_response :success
     amf_parse_response
     assert_response :success
     amf_parse_response

-    way = amf_result("/1")
-    assert_equal -4, way[0], -4
-    assert_equal "way", way[1]
-    assert_equal id, way[2]
-    assert(way[3].nil?) && way[4].nil? && way[5].nil? && way[6].nil?
+    result = amf_result("/1")
+    assert_equal(-4, result[0])
+    assert_equal "way", result[1]
+    assert_equal id, result[2]
+    assert(result[3].nil? && result[4].nil? && result[5].nil? && result[6].nil?)

   end
 
   def test_getway_with_versions
     # check a way with multiple versions
   end
 
   def test_getway_with_versions
     # check a way with multiple versions

-    id = current_ways(:way_with_versions).id
-    amf_content "getway", "/1", [id]
-    post :amf_read
+    way = create(:way, :with_history, :version => 4)
+    create(:way_node, :way => way)
+    node = way.nodes.first
+    user = way.changeset.user
+
+    post :amf_read, :body => amf_content("getway", "/1", [way.id])

     assert_response :success
     amf_parse_response
     assert_response :success
     amf_parse_response

-    way = amf_result("/1")
-    assert_equal 0, way[0]
-    assert_equal "", way[1]
-    assert_equal id, way[2]
-    assert_equal 1, way[3].length
-    assert_equal 15, way[3][0][2]
-    assert_equal 4, way[5]
-    assert_equal 2, way[6]
+    result = amf_result("/1")
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+    assert_equal way.id, result[2]
+    assert_equal 1, result[3].length
+    assert_equal node.id, result[3][0][2]
+    assert_equal way.version, result[5]
+    assert_equal user.id, result[6]

   end
 
   def test_getway_with_duplicate_nodes
     # check a way with duplicate nodes
   end
 
   def test_getway_with_duplicate_nodes
     # check a way with duplicate nodes

-    id = current_ways(:way_with_duplicate_nodes).id
-    amf_content "getway", "/1", [id]
-    post :amf_read
+    way = create(:way)
+    node = create(:node)
+    create(:way_node, :way => way, :node => node, :sequence_id => 1)
+    create(:way_node, :way => way, :node => node, :sequence_id => 2)
+    user = way.changeset.user
+
+    post :amf_read, :body => amf_content("getway", "/1", [way.id])

     assert_response :success
     amf_parse_response
     assert_response :success
     amf_parse_response

-    way = amf_result("/1")
-    assert_equal 0, way[0]
-    assert_equal "", way[1]
-    assert_equal id, way[2]
-    assert_equal 2, way[3].length
-    assert_equal 4, way[3][0][2]
-    assert_equal 4, way[3][1][2]
-    assert_equal 1, way[5]
-    assert_equal 2, way[6]
+    result = amf_result("/1")
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+    assert_equal way.id, result[2]
+    assert_equal 2, result[3].length
+    assert_equal node.id, result[3][0][2]
+    assert_equal node.id, result[3][1][2]
+    assert_equal way.version, result[5]
+    assert_equal user.id, result[6]

   end
 
   def test_getway_with_multiple_nodes
     # check a way with multiple nodes
   end
 
   def test_getway_with_multiple_nodes
     # check a way with multiple nodes

-    id = current_ways(:way_with_multiple_nodes).id
-    amf_content "getway", "/1", [id]
-    post :amf_read
+    way = create(:way_with_nodes, :nodes_count => 3)
+    a = way.nodes[0].id
+    b = way.nodes[1].id
+    c = way.nodes[2].id
+    user = way.changeset.user
+
+    post :amf_read, :body => amf_content("getway", "/1", [way.id])

     assert_response :success
     amf_parse_response
     assert_response :success
     amf_parse_response

-    way = amf_result("/1")
-    assert_equal 0, way[0]
-    assert_equal "", way[1]
-    assert_equal id, way[2]
-    assert_equal 3, way[3].length
-    assert_equal 4, way[3][0][2]
-    assert_equal 15, way[3][1][2]
-    assert_equal 11, way[3][2][2]
-    assert_equal 2, way[5]
-    assert_equal 2, way[6]
+    result = amf_result("/1")
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+    assert_equal way.id, result[2]
+    assert_equal 3, result[3].length
+    assert_equal a, result[3][0][2]
+    assert_equal b, result[3][1][2]
+    assert_equal c, result[3][2][2]
+    assert_equal way.version, result[5]
+    assert_equal user.id, result[6]

   end
 
   def test_getway_nonexistent
     # check chat a non-existent way is not returned
   end
 
   def test_getway_nonexistent
     # check chat a non-existent way is not returned

-    amf_content "getway", "/1", [0]
-    post :amf_read
+    post :amf_read, :body => amf_content("getway", "/1", [0])

     assert_response :success
     amf_parse_response
     way = amf_result("/1")
     assert_response :success
     amf_parse_response
     way = amf_result("/1")

-    assert_equal -4, way[0]
+    assert_equal(-4, way[0])

     assert_equal "way", way[1]
     assert_equal 0, way[2]
     assert(way[3].nil?) && way[4].nil? && way[5].nil? && way[6].nil?
     assert_equal "way", way[1]
     assert_equal 0, way[2]
     assert(way[3].nil?) && way[4].nil? && way[5].nil? && way[6].nil?


@@ -155,8 +164,7 @@ class AmfControllerTest < ActionController::TestCase
     minlat = node.lat - 0.1
     maxlon = node.lon + 0.1
     maxlat = node.lat + 0.1
     minlat = node.lat - 0.1
     maxlon = node.lon + 0.1
     maxlat = node.lat + 0.1

-    amf_content "whichways", "/1", [minlon, minlat, maxlon, maxlat]
-    post :amf_read
+    post :amf_read, :body => amf_content("whichways", "/1", [minlon, minlat, maxlon, maxlat])

     assert_response :success
     amf_parse_response
 
     assert_response :success
     amf_parse_response
 


@@ -198,8 +206,8 @@ class AmfControllerTest < ActionController::TestCase
     ways = map[2].collect { |x| x[0] }
     assert ways.include?(way.id),
            "map should include used way"
     ways = map[2].collect { |x| x[0] }
     assert ways.include?(way.id),
            "map should include used way"

-    assert !ways.include?(deleted_way.id),
-           "map should not include deleted way"
+    assert_not ways.include?(deleted_way.id),
+               "map should not include deleted way"

   end
 
   ##
   end
 
   ##


@@ -235,19 +243,21 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_whichways_deleted
   end
 
   def test_whichways_deleted

-    node = create(:node, :lat => 3.0, :lon => 3.0)
-    way = create(:way)
-    deleted_way = create(:way, :deleted)
+    node = create(:node, :with_history, :lat => 24.0, :lon => 24.0)
+    way = create(:way, :with_history)
+    way_v1 = way.old_ways.find_by(:version => 1)
+    deleted_way = create(:way, :with_history, :deleted)
+    deleted_way_v1 = deleted_way.old_ways.find_by(:version => 1)

     create(:way_node, :way => way, :node => node)
     create(:way_node, :way => deleted_way, :node => node)
     create(:way_node, :way => way, :node => node)
     create(:way_node, :way => deleted_way, :node => node)

-    create(:way_tag, :way => way)
+    create(:old_way_node, :old_way => way_v1, :node => node)
+    create(:old_way_node, :old_way => deleted_way_v1, :node => node)

 
     minlon = node.lon - 0.1
     minlat = node.lat - 0.1
     maxlon = node.lon + 0.1
     maxlat = node.lat + 0.1
 
     minlon = node.lon - 0.1
     minlat = node.lat - 0.1
     maxlon = node.lon + 0.1
     maxlat = node.lat + 0.1

-    amf_content "whichways_deleted", "/1", [minlon, minlat, maxlon, maxlat]
-    post :amf_read
+    post :amf_read, :body => amf_content("whichways_deleted", "/1", [minlon, minlat, maxlon, maxlat])

     assert_response :success
     amf_parse_response
 
     assert_response :success
     amf_parse_response
 


@@ -258,16 +268,15 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal Array, map[2].class, "third map element should be an array"
     # TODO: looks like amf_controller changed since this test was written
     # so someone who knows what they're doing should check this!
     assert_equal Array, map[2].class, "third map element should be an array"
     # TODO: looks like amf_controller changed since this test was written
     # so someone who knows what they're doing should check this!

-    assert !map[2].include?(current_ways(:used_way).id),
-           "map should not include used way"
-    assert map[2].include?(current_ways(:invisible_way).id),
+    assert_not map[2].include?(way.id),
+               "map should not include visible way"
+    assert map[2].include?(deleted_way.id),

            "map should include deleted way"
   end
 
   def test_whichways_deleted_toobig
     bbox = [-0.1, -0.1, 1.1, 1.1]
            "map should include deleted way"
   end
 
   def test_whichways_deleted_toobig
     bbox = [-0.1, -0.1, 1.1, 1.1]

-    amf_content "whichways_deleted", "/1", bbox
-    post :amf_read
+    post :amf_read, :body => amf_content("whichways_deleted", "/1", bbox)

     assert_response :success
     amf_parse_response
 
     assert_response :success
     amf_parse_response
 


@@ -276,9 +285,8 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_getrelation
   end
 
   def test_getrelation

-    id = current_relations(:visible_relation).id
-    amf_content "getrelation", "/1", [id]
-    post :amf_read
+    id = create(:relation).id
+    post :amf_read, :body => amf_content("getrelation", "/1", [id])

     assert_response :success
     amf_parse_response
     rel = amf_result("/1")
     assert_response :success
     amf_parse_response
     rel = amf_result("/1")


@@ -287,9 +295,8 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_getrelation_invisible
   end
 
   def test_getrelation_invisible

-    id = current_relations(:invisible_relation).id
-    amf_content "getrelation", "/1", [id]
-    post :amf_read
+    id = create(:relation, :deleted).id
+    post :amf_read, :body => amf_content("getrelation", "/1", [id])

     assert_response :success
     amf_parse_response
     rel = amf_result("/1")
     assert_response :success
     amf_parse_response
     rel = amf_result("/1")


@@ -301,8 +308,7 @@ class AmfControllerTest < ActionController::TestCase
 
   def test_getrelation_nonexistent
     id = 0
 
   def test_getrelation_nonexistent
     id = 0

-    amf_content "getrelation", "/1", [id]
-    post :amf_read
+    post :amf_read, :body => amf_content("getrelation", "/1", [id])

     assert_response :success
     amf_parse_response
     rel = amf_result("/1")
     assert_response :success
     amf_parse_response
     rel = amf_result("/1")


@@ -313,16 +319,17 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_getway_old
   end
 
   def test_getway_old

+    latest = create(:way, :version => 2)
+    v1 = create(:old_way, :current_way => latest, :version => 1, :timestamp => Time.now.utc - 2.minutes)
+    _v2 = create(:old_way, :current_way => latest, :version => 2, :timestamp => Time.now.utc - 1.minute)
+

     # try to get the last visible version (specified by <0) (should be current version)
     # try to get the last visible version (specified by <0) (should be current version)

-    latest = current_ways(:way_with_versions)

     # NOTE: looks from the API changes that this now expects a timestamp
     # instead of a version number...
     # try to get version 1
     # NOTE: looks from the API changes that this now expects a timestamp
     # instead of a version number...
     # try to get version 1

-    v1 = ways(:way_with_versions_v2)

     { latest.id => "",
     { latest.id => "",

-      v1.way_id => v1.timestamp.strftime("%d %b %Y, %H:%M:%S") }.each do |id, t|
-      amf_content "getway_old", "/1", [id, t]
-      post :amf_read
+      v1.way_id => (v1.timestamp + 1).strftime("%d %b %Y, %H:%M:%S") }.each do |id, t|
+      post :amf_read, :body => amf_content("getway_old", "/1", [id, t])

       assert_response :success
       amf_parse_response
       returned_way = amf_result("/1")
       assert_response :success
       amf_parse_response
       returned_way = amf_result("/1")


@@ -337,18 +344,17 @@ class AmfControllerTest < ActionController::TestCase
   # test that the server doesn't fall over when rubbish is passed
   # into the method args.
   def test_getway_old_invalid
   # test that the server doesn't fall over when rubbish is passed
   # into the method args.
   def test_getway_old_invalid

-    way_id = current_ways(:way_with_versions).id
-    { "foo"  => "bar",
+    way_id = create(:way, :with_history, :version => 2).id
+    { "foo" => "bar",

       way_id => "not a date",
       way_id => "2009-03-25 00:00:00",                   # <- wrong format
       way_id => "0 Jan 2009 00:00:00",                   # <- invalid date
       way_id => "not a date",
       way_id => "2009-03-25 00:00:00",                   # <- wrong format
       way_id => "0 Jan 2009 00:00:00",                   # <- invalid date

-      -1     => "1 Jan 2009 00:00:00" }.each do |id, t|  # <- invalid
-      amf_content "getway_old", "/1", [id, t]
-      post :amf_read
+      -1 => "1 Jan 2009 00:00:00" }.each do |id, t| # <- invalid
+      post :amf_read, :body => amf_content("getway_old", "/1", [id, t])

       assert_response :success
       amf_parse_response
       returned_way = amf_result("/1")
       assert_response :success
       amf_parse_response
       returned_way = amf_result("/1")

-      assert_equal -1, returned_way[0]
+      assert_equal(-1, returned_way[0])

       assert returned_way[3].nil?
       assert returned_way[4].nil?
       assert returned_way[5].nil?
       assert returned_way[3].nil?
       assert returned_way[4].nil?
       assert returned_way[5].nil?


@@ -357,18 +363,18 @@ class AmfControllerTest < ActionController::TestCase
 
   def test_getway_old_nonexistent
     # try to get the last version-10 (shoudn't exist)
 
   def test_getway_old_nonexistent
     # try to get the last version-10 (shoudn't exist)

-    v1 = ways(:way_with_versions_v1)
+    way = create(:way, :with_history, :version => 2)
+    v1 = way.old_ways.find_by(:version => 1)

     # try to get last visible version of non-existent way
     # try to get specific version of non-existent way
     [[0, ""],
      [0, "1 Jan 1970, 00:00:00"],
      [v1.way_id, (v1.timestamp - 10).strftime("%d %b %Y, %H:%M:%S")]].each do |id, t|
     # try to get last visible version of non-existent way
     # try to get specific version of non-existent way
     [[0, ""],
      [0, "1 Jan 1970, 00:00:00"],
      [v1.way_id, (v1.timestamp - 10).strftime("%d %b %Y, %H:%M:%S")]].each do |id, t|

-      amf_content "getway_old", "/1", [id, t]
-      post :amf_read
+      post :amf_read, :body => amf_content("getway_old", "/1", [id, t])

       assert_response :success
       amf_parse_response
       returned_way = amf_result("/1")
       assert_response :success
       amf_parse_response
       returned_way = amf_result("/1")

-      assert_equal -1, returned_way[0]
+      assert_equal(-1, returned_way[0])

       assert returned_way[3].nil?
       assert returned_way[4].nil?
       assert returned_way[5].nil?
       assert returned_way[3].nil?
       assert returned_way[4].nil?
       assert returned_way[5].nil?


@@ -376,15 +382,15 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_getway_old_invisible
   end
 
   def test_getway_old_invisible

-    v1 = ways(:invisible_way)
+    way = create(:way, :deleted, :with_history, :version => 1)
+    v1 = way.old_ways.find_by(:version => 1)

     # try to get deleted version
     [[v1.way_id, (v1.timestamp + 10).strftime("%d %b %Y, %H:%M:%S")]].each do |id, t|
     # try to get deleted version
     [[v1.way_id, (v1.timestamp + 10).strftime("%d %b %Y, %H:%M:%S")]].each do |id, t|

-      amf_content "getway_old", "/1", [id, t]
-      post :amf_read
+      post :amf_read, :body => amf_content("getway_old", "/1", [id, t])

       assert_response :success
       amf_parse_response
       returned_way = amf_result("/1")
       assert_response :success
       amf_parse_response
       returned_way = amf_result("/1")

-      assert_equal -1, returned_way[0]
+      assert_equal(-1, returned_way[0])

       assert returned_way[3].nil?
       assert returned_way[4].nil?
       assert returned_way[5].nil?
       assert returned_way[3].nil?
       assert returned_way[4].nil?
       assert returned_way[5].nil?


@@ -392,11 +398,11 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_getway_history
   end
 
   def test_getway_history

-    latest = current_ways(:way_with_versions)
-    oldest = ways(:way_with_versions_v1)
+    latest = create(:way, :version => 2)
+    oldest = create(:old_way, :current_way => latest, :version => 1, :timestamp => latest.timestamp - 2.minutes)
+    create(:old_way, :current_way => latest, :version => 2, :timestamp => latest.timestamp)

 
 

-    amf_content "getway_history", "/1", [latest.id]
-    post :amf_read
+    post :amf_read, :body => amf_content("getway_history", "/1", [latest.id])

     assert_response :success
     amf_parse_response
     history = amf_result("/1")
     assert_response :success
     amf_parse_response
     history = amf_result("/1")


@@ -413,8 +419,7 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_getway_history_nonexistent
   end
 
   def test_getway_history_nonexistent

-    amf_content "getway_history", "/1", [0]
-    post :amf_read
+    post :amf_read, :body => amf_content("getway_history", "/1", [0])

     assert_response :success
     amf_parse_response
     history = amf_result("/1")
     assert_response :success
     amf_parse_response
     history = amf_result("/1")


@@ -431,8 +436,7 @@ class AmfControllerTest < ActionController::TestCase
     _node_v2 = create(:old_node, :current_node => node, :version => 2, :timestamp => 2.days.ago)
     node_v3 = create(:old_node, :current_node => node, :version => 3, :timestamp => 1.day.ago)
 
     _node_v2 = create(:old_node, :current_node => node, :version => 2, :timestamp => 2.days.ago)
     node_v3 = create(:old_node, :current_node => node, :version => 3, :timestamp => 1.day.ago)
 

-    amf_content "getnode_history", "/1", [node.id]
-    post :amf_read
+    post :amf_read, :body => amf_content("getnode_history", "/1", [node.id])

     assert_response :success
     amf_parse_response
     history = amf_result("/1")
     assert_response :success
     amf_parse_response
     history = amf_result("/1")


@@ -453,8 +457,7 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_getnode_history_nonexistent
   end
 
   def test_getnode_history_nonexistent

-    amf_content "getnode_history", "/1", [0]
-    post :amf_read
+    post :amf_read, :body => amf_content("getnode_history", "/1", [0])

     assert_response :success
     amf_parse_response
     history = amf_result("/1")
     assert_response :success
     amf_parse_response
     history = amf_result("/1")


@@ -466,35 +469,32 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_findgpx_bad_user
   end
 
   def test_findgpx_bad_user

-    amf_content "findgpx", "/1", [1, "test@example.com:wrong"]
-    post :amf_read
+    post :amf_read, :body => amf_content("findgpx", "/1", [1, "test@example.com:wrong"])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 2, result.length
     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 2, result.length

-    assert_equal -1, result[0]
-    assert_match /must be logged in/, result[1]
+    assert_equal(-1, result[0])
+    assert_match(/must be logged in/, result[1])

 
     blocked_user = create(:user)
     create(:user_block, :user => blocked_user)
 
     blocked_user = create(:user)
     create(:user_block, :user => blocked_user)

-    amf_content "findgpx", "/1", [1, "#{blocked_user.email}:test"]
-    post :amf_read
+    post :amf_read, :body => amf_content("findgpx", "/1", [1, "#{blocked_user.email}:test"])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 2, result.length
     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 2, result.length

-    assert_equal -1, result[0]
-    assert_match /access to the API has been blocked/, result[1]
+    assert_equal(-1, result[0])
+    assert_match(/access to the API has been blocked/, result[1])

   end
 
   def test_findgpx_by_id
     user = create(:user)
     trace = create(:trace, :visibility => "private", :user => user)
 
   end
 
   def test_findgpx_by_id
     user = create(:user)
     trace = create(:trace, :visibility => "private", :user => user)
 

-    amf_content "findgpx", "/1", [trace.id, "#{user.email}:test"]
-    post :amf_read
+    post :amf_read, :body => amf_content("findgpx", "/1", [trace.id, "#{user.email}:test"])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -511,22 +511,22 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_findgpx_by_name
   end
 
   def test_findgpx_by_name

-    amf_content "findgpx", "/1", ["Trace", "test@example.com:test"]
-    post :amf_read
+    user = create(:user)
+
+    post :amf_read, :body => amf_content("findgpx", "/1", ["Trace", "#{user.email}:test"])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     # find by name fails as it uses mysql text search syntax...
     assert_equal 2, result.length
     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     # find by name fails as it uses mysql text search syntax...
     assert_equal 2, result.length

-    assert_equal -2, result[0]
+    assert_equal(-2, result[0])

   end
 
   def test_findrelations_by_id
   end
 
   def test_findrelations_by_id

-    relation = current_relations(:relation_with_versions)
+    relation = create(:relation, :version => 4)

 
 

-    amf_content "findrelations", "/1", [relation.id]
-    post :amf_read
+    post :amf_read, :body => amf_content("findrelations", "/1", [relation.id])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -538,8 +538,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal relation.members, result[0][2]
     assert_equal relation.version, result[0][3]
 
     assert_equal relation.members, result[0][2]
     assert_equal relation.version, result[0][3]
 

-    amf_content "findrelations", "/1", [999999]
-    post :amf_read
+    post :amf_read, :body => amf_content("findrelations", "/1", [999999])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -548,14 +547,15 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_findrelations_by_tags
   end
 
   def test_findrelations_by_tags

-    visible_relation = current_relations(:visible_relation)
+    visible_relation = create(:relation)

     create(:relation_tag, :relation => visible_relation, :k => "test", :v => "yes")
     create(:relation_tag, :relation => visible_relation, :k => "test", :v => "yes")

-    used_relation = current_relations(:used_relation)
+    used_relation = create(:relation)
+    super_relation = create(:relation)
+    create(:relation_member, :relation => super_relation, :member => used_relation)

     create(:relation_tag, :relation => used_relation, :k => "test", :v => "yes")
     create(:relation_tag, :relation => used_relation, :k => "name", :v => "Test Relation")
 
     create(:relation_tag, :relation => used_relation, :k => "test", :v => "yes")
     create(:relation_tag, :relation => used_relation, :k => "name", :v => "Test Relation")
 

-    amf_content "findrelations", "/1", ["yes"]
-    post :amf_read
+    post :amf_read, :body => amf_content("findrelations", "/1", ["yes"])

     assert_response :success
     amf_parse_response
     result = amf_result("/1").sort
     assert_response :success
     amf_parse_response
     result = amf_result("/1").sort


@@ -572,8 +572,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal used_relation.members, result[1][2]
     assert_equal used_relation.version, result[1][3]
 
     assert_equal used_relation.members, result[1][2]
     assert_equal used_relation.version, result[1][3]
 

-    amf_content "findrelations", "/1", ["no"]
-    post :amf_read
+    post :amf_read, :body => amf_content("findrelations", "/1", ["no"])

     assert_response :success
     amf_parse_response
     result = amf_result("/1").sort
     assert_response :success
     amf_parse_response
     result = amf_result("/1").sort


@@ -585,8 +584,7 @@ class AmfControllerTest < ActionController::TestCase
     node = create(:node, :with_history, :version => 4)
     create(:node_tag, :node => node)
 
     node = create(:node, :with_history, :version => 4)
     create(:node_tag, :node => node)
 

-    amf_content "getpoi", "/1", [node.id, ""]
-    post :amf_read
+    post :amf_read, :body => amf_content("getpoi", "/1", [node.id, ""])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -600,14 +598,13 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal node.tags, result[5]
     assert_equal node.version, result[6]
 
     assert_equal node.tags, result[5]
     assert_equal node.version, result[6]
 

-    amf_content "getpoi", "/1", [999999, ""]
-    post :amf_read
+    post :amf_read, :body => amf_content("getpoi", "/1", [999999, ""])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 3, result.length
     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 3, result.length

-    assert_equal -4, result[0]
+    assert_equal(-4, result[0])

     assert_equal "node", result[1]
     assert_equal 999999, result[2]
   end
     assert_equal "node", result[1]
     assert_equal 999999, result[2]
   end


@@ -620,8 +617,7 @@ class AmfControllerTest < ActionController::TestCase
     # previous whole second, causing <= comparison to fail
     timestamp = (node.timestamp + 1.second).xmlschema
 
     # previous whole second, causing <= comparison to fail
     timestamp = (node.timestamp + 1.second).xmlschema
 

-    amf_content "getpoi", "/1", [node.node_id, timestamp]
-    post :amf_read
+    post :amf_read, :body => amf_content("getpoi", "/1", [node.node_id, timestamp])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -635,25 +631,23 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal node.tags, result[5]
     assert_equal current_node.version, result[6]
 
     assert_equal node.tags, result[5]
     assert_equal current_node.version, result[6]
 

-    amf_content "getpoi", "/1", [node.node_id, "2000-01-01T00:00:00Z"]
-    post :amf_read
+    post :amf_read, :body => amf_content("getpoi", "/1", [node.node_id, "2000-01-01T00:00:00Z"])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 3, result.length
     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 3, result.length

-    assert_equal -4, result[0]
+    assert_equal(-4, result[0])

     assert_equal "node", result[1]
     assert_equal node.node_id, result[2]
 
     assert_equal "node", result[1]
     assert_equal node.node_id, result[2]
 

-    amf_content "getpoi", "/1", [999999, Time.now.xmlschema]
-    post :amf_read
+    post :amf_read, :body => amf_content("getpoi", "/1", [999999, Time.now.xmlschema])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 3, result.length
     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 3, result.length

-    assert_equal -4, result[0]
+    assert_equal(-4, result[0])

     assert_equal "node", result[1]
     assert_equal 999999, result[2]
   end
     assert_equal "node", result[1]
     assert_equal 999999, result[2]
   end


@@ -666,8 +660,7 @@ class AmfControllerTest < ActionController::TestCase
     nd = create(:node)
     cs_id = nd.changeset.id
     user = nd.changeset.user
     nd = create(:node)
     cs_id = nd.changeset.id
     user = nd.changeset.user

-    amf_content "putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, nd.visible]
-    post :amf_write
+    post :amf_write, :body => amf_content("putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, nd.visible])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -682,8 +675,7 @@ class AmfControllerTest < ActionController::TestCase
     # Now try to update again, with a different lat/lon, using the updated version number
     lat = nd.lat + 0.1
     lon = nd.lon - 0.1
     # Now try to update again, with a different lat/lon, using the updated version number
     lat = nd.lat + 0.1
     lon = nd.lon - 0.1

-    amf_content "putpoi", "/2", ["#{user.email}:test", cs_id, nd.version + 1, nd.id, lon, lat, nd.tags, nd.visible]
-    post :amf_write
+    post :amf_write, :body => amf_content("putpoi", "/2", ["#{user.email}:test", cs_id, nd.version + 1, nd.id, lon, lat, nd.tags, nd.visible])

     assert_response :success
     amf_parse_response
     result = amf_result("/2")
     assert_response :success
     amf_parse_response
     result = amf_result("/2")


@@ -702,13 +694,13 @@ class AmfControllerTest < ActionController::TestCase
     # This node has no tags
 
     # create a node with random lat/lon
     # This node has no tags
 
     # create a node with random lat/lon

-    lat = rand(100) - 50 + rand
-    lon = rand(100) - 50 + rand
-    # normal user has a changeset open
-    changeset = changesets(:public_user_first_change)
+    lat = rand(-50..49) + rand
+    lon = rand(-50..49) + rand
+
+    changeset = create(:changeset)
+    user = changeset.user

 
 

-    amf_content "putpoi", "/1", ["test@example.com:test", changeset.id, nil, nil, lon, lat, {}, nil]
-    post :amf_write
+    post :amf_write, :body => amf_content("putpoi", "/1", ["#{user.email}:test", changeset.id, nil, nil, lon, lat, {}, nil])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -717,7 +709,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal 5, result.size
     assert_equal 0, result[0], "expected to get the status ok from the amf"
     assert_equal 0, result[2], "The old id should be 0"
     assert_equal 5, result.size
     assert_equal 0, result[0], "expected to get the status ok from the amf"
     assert_equal 0, result[2], "The old id should be 0"

-    assert result[3] > 0, "The new id should be greater than 0"
+    assert result[3].positive?, "The new id should be greater than 0"

     assert_equal 1, result[4], "The new version should be 1"
 
     # Finally check that the node that was saved has saved the data correctly
     assert_equal 1, result[4], "The new version should be 1"
 
     # Finally check that the node that was saved has saved the data correctly


@@ -729,7 +721,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal 0, current_node.tags.size, "There seems to be a tag that has been added to the node"
     assert_equal result[4], current_node.version, "The version returned, is different to the one returned by the amf"
     # Now check the history table
     assert_equal 0, current_node.tags.size, "There seems to be a tag that has been added to the node"
     assert_equal result[4], current_node.version, "The version returned, is different to the one returned by the amf"
     # Now check the history table

-    historic_nodes = Node.where(:id => result[3])
+    historic_nodes = OldNode.where(:node_id => result[3])

     assert_equal 1, historic_nodes.size, "There should only be one historic node created"
     first_historic_node = historic_nodes.first
     assert_in_delta lat, first_historic_node.lat, 0.00001, "The latitude was not retreived correctly"
     assert_equal 1, historic_nodes.size, "There should only be one historic node created"
     first_historic_node = historic_nodes.first
     assert_in_delta lat, first_historic_node.lat, 0.00001, "The latitude was not retreived correctly"


@@ -741,13 +733,10 @@ class AmfControllerTest < ActionController::TestCase
     # This node has some tags
 
     # create a node with random lat/lon
     # This node has some tags
 
     # create a node with random lat/lon

-    lat = rand(100) - 50 + rand
-    lon = rand(100) - 50 + rand
-    # normal user has a changeset open
-    changeset = changesets(:public_user_first_change)
+    lat = rand(-50..49) + rand
+    lon = rand(-50..49) + rand

 
 

-    amf_content "putpoi", "/2", ["test@example.com:test", changeset.id, nil, nil, lon, lat, { "key" => "value", "ping" => "pong" }, nil]
-    post :amf_write
+    post :amf_write, :body => amf_content("putpoi", "/2", ["#{user.email}:test", changeset.id, nil, nil, lon, lat, { "key" => "value", "ping" => "pong" }, nil])

     assert_response :success
     amf_parse_response
     result = amf_result("/2")
     assert_response :success
     amf_parse_response
     result = amf_result("/2")


@@ -756,7 +745,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal 5, result.size
     assert_equal 0, result[0], "Expected to get the status ok in the amf"
     assert_equal 0, result[2], "The old id should be 0"
     assert_equal 5, result.size
     assert_equal 0, result[0], "Expected to get the status ok in the amf"
     assert_equal 0, result[2], "The old id should be 0"

-    assert result[3] > 0, "The new id should be greater than 0"
+    assert result[3].positive?, "The new id should be greater than 0"

     assert_equal 1, result[4], "The new version should be 1"
 
     # Finally check that the node that was saved has saved the data correctly
     assert_equal 1, result[4], "The new version should be 1"
 
     # Finally check that the node that was saved has saved the data correctly


@@ -769,7 +758,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal({ "key" => "value", "ping" => "pong" }, current_node.tags, "tags are different")
     assert_equal result[4], current_node.version, "The version returned, is different to the one returned by the amf"
     # Now check the history table
     assert_equal({ "key" => "value", "ping" => "pong" }, current_node.tags, "tags are different")
     assert_equal result[4], current_node.version, "The version returned, is different to the one returned by the amf"
     # Now check the history table

-    historic_nodes = Node.where(:id => result[3])
+    historic_nodes = OldNode.where(:node_id => result[3])

     assert_equal 1, historic_nodes.size, "There should only be one historic node created"
     first_historic_node = historic_nodes.first
     assert_in_delta lat, first_historic_node.lat, 0.00001, "The latitude was not retreived correctly"
     assert_equal 1, historic_nodes.size, "There should only be one historic node created"
     first_historic_node = historic_nodes.first
     assert_in_delta lat, first_historic_node.lat, 0.00001, "The latitude was not retreived correctly"


@@ -784,16 +773,16 @@ class AmfControllerTest < ActionController::TestCase
     # This node has no tags
 
     # create a node with random lat/lon
     # This node has no tags
 
     # create a node with random lat/lon

-    lat = rand(100) - 50 + rand
-    lon = rand(100) - 50 + rand
-    # normal user has a changeset open
-    changeset = changesets(:public_user_first_change)
+    lat = rand(-50..49) + rand
+    lon = rand(-50..49) + rand
+
+    changeset = create(:changeset)
+    user = changeset.user

 
     mostly_invalid = (0..31).to_a.map(&:chr).join
     tags = { "something" => "foo#{mostly_invalid}bar" }
 
 
     mostly_invalid = (0..31).to_a.map(&:chr).join
     tags = { "something" => "foo#{mostly_invalid}bar" }
 

-    amf_content "putpoi", "/1", ["test@example.com:test", changeset.id, nil, nil, lon, lat, tags, nil]
-    post :amf_write
+    post :amf_write, :body => amf_content("putpoi", "/1", ["#{user.email}:test", changeset.id, nil, nil, lon, lat, tags, nil])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -802,7 +791,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal 5, result.size
     assert_equal 0, result[0], "Expected to get the status ok in the amf"
     assert_equal 0, result[2], "The old id should be 0"
     assert_equal 5, result.size
     assert_equal 0, result[0], "Expected to get the status ok in the amf"
     assert_equal 0, result[2], "The old id should be 0"

-    assert result[3] > 0, "The new id should be greater than 0"
+    assert result[3].positive?, "The new id should be greater than 0"

     assert_equal 1, result[4], "The new version should be 1"
 
     # Finally check that the node that was saved has saved the data correctly
     assert_equal 1, result[4], "The new version should be 1"
 
     # Finally check that the node that was saved has saved the data correctly


@@ -819,22 +808,22 @@ class AmfControllerTest < ActionController::TestCase
     # This node has no tags
 
     # create a node with random lat/lon
     # This node has no tags
 
     # create a node with random lat/lon

-    lat = rand(100) - 50 + rand
-    lon = rand(100) - 50 + rand
-    # normal user has a changeset open
-    changeset = changesets(:public_user_first_change)
+    lat = rand(-50..49) + rand
+    lon = rand(-50..49) + rand
+
+    changeset = create(:changeset)
+    user = changeset.user

 
     invalid = "\xc0\xc0"
     tags = { "something" => "foo#{invalid}bar" }
 
 
     invalid = "\xc0\xc0"
     tags = { "something" => "foo#{invalid}bar" }
 

-    amf_content "putpoi", "/1", ["test@example.com:test", changeset.id, nil, nil, lon, lat, tags, nil]
-    post :amf_write
+    post :amf_write, :body => amf_content("putpoi", "/1", ["#{user.email}:test", changeset.id, nil, nil, lon, lat, tags, nil])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 2, result.size
     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 2, result.size

-    assert_equal -1, result[0], "Expected to get the status FAIL in the amf"
+    assert_equal(-1, result[0], "Expected to get the status FAIL in the amf")

     assert_equal "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1.", result[1]
   end
 
     assert_equal "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1.", result[1]
   end
 


@@ -844,8 +833,7 @@ class AmfControllerTest < ActionController::TestCase
     cs_id = nd.changeset.id
     user = nd.changeset.user
 
     cs_id = nd.changeset.id
     user = nd.changeset.user
 

-    amf_content "putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, false]
-    post :amf_write
+    post :amf_write, :body => amf_content("putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, false])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -867,14 +855,13 @@ class AmfControllerTest < ActionController::TestCase
     cs_id = nd.changeset.id
     user = nd.changeset.user
 
     cs_id = nd.changeset.id
     user = nd.changeset.user
 

-    amf_content "putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, false]
-    post :amf_write
+    post :amf_write, :body => amf_content("putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, false])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 3, result.size
     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 3, result.size

-    assert_equal -4, result[0]
+    assert_equal(-4, result[0])

     assert_equal "node", result[1]
     assert_equal nd.id, result[2]
   end
     assert_equal "node", result[1]
     assert_equal nd.id, result[2]
   end


@@ -885,14 +872,13 @@ class AmfControllerTest < ActionController::TestCase
     cs_id = changeset.id
     user = changeset.user
 
     cs_id = changeset.id
     user = changeset.user
 

-    amf_content "putpoi", "/1", ["#{user.email}:test", cs_id, 1, 999999, 0, 0, {}, false]
-    post :amf_write
+    post :amf_write, :body => amf_content("putpoi", "/1", ["#{user.email}:test", cs_id, 1, 999999, 0, 0, {}, false])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 3, result.size
     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 3, result.size

-    assert_equal -4, result[0]
+    assert_equal(-4, result[0])

     assert_equal "node", result[1]
     assert_equal 999999, result[2]
   end
     assert_equal "node", result[1]
     assert_equal 999999, result[2]
   end


@@ -903,15 +889,14 @@ class AmfControllerTest < ActionController::TestCase
     cs_id = nd.changeset.id
     user = nd.changeset.user
 
     cs_id = nd.changeset.id
     user = nd.changeset.user
 

-    amf_content "putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, 200, 100, nd.tags, true]
-    post :amf_write
+    post :amf_write, :body => amf_content("putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, 200, 100, nd.tags, true])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 2, result.size
     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 2, result.size

-    assert_equal -2, result[0]
-    assert_match /Node is not in the world/, result[1]
+    assert_equal(-2, result[0])
+    assert_match(/Node is not in the world/, result[1])

   end
 
   # check that we can create a way
   end
 
   # check that we can create a way


@@ -926,8 +911,7 @@ class AmfControllerTest < ActionController::TestCase
     d = create(:node).id
     e = create(:node).id
 
     d = create(:node).id
     e = create(:node).id
 

-    amf_content "putway", "/1", ["#{user.email}:test", cs_id, 0, -1, [a, b, c], { "test" => "new" }, [], {}]
-    post :amf_write
+    post :amf_write, :body => amf_content("putway", "/1", ["#{user.email}:test", cs_id, 0, -1, [a, b, c], { "test" => "new" }, [], {}])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -936,8 +920,8 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal 8, result.size
     assert_equal 0, result[0]
     assert_equal "", result[1]
     assert_equal 8, result.size
     assert_equal 0, result[0]
     assert_equal "", result[1]

-    assert_equal -1, result[2]
-    assert_not_equal -1, result[3]
+    assert_equal(-1, result[2])
+    assert_not_equal(-1, result[3])

     assert_equal({}, result[4])
     assert_equal 1, result[5]
     assert_equal({}, result[6])
     assert_equal({}, result[4])
     assert_equal 1, result[5]
     assert_equal({}, result[6])


@@ -948,8 +932,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal [a, b, c], new_way.nds
     assert_equal({ "test" => "new" }, new_way.tags)
 
     assert_equal [a, b, c], new_way.nds
     assert_equal({ "test" => "new" }, new_way.tags)
 

-    amf_content "putway", "/1", ["#{user.email}:test", cs_id, 0, -1, [b, d, e, a], { "test" => "newer" }, [], {}]
-    post :amf_write
+    post :amf_write, :body => amf_content("putway", "/1", ["#{user.email}:test", cs_id, 0, -1, [b, d, e, a], { "test" => "newer" }, [], {}])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -958,8 +941,8 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal 8, result.size
     assert_equal 0, result[0]
     assert_equal "", result[1]
     assert_equal 8, result.size
     assert_equal 0, result[0]
     assert_equal "", result[1]

-    assert_equal -1, result[2]
-    assert_not_equal -1, result[3]
+    assert_equal(-1, result[2])
+    assert_not_equal(-1, result[3])

     assert_equal({}, result[4])
     assert_equal 1, result[5]
     assert_equal({}, result[6])
     assert_equal({}, result[4])
     assert_equal 1, result[5]
     assert_equal({}, result[6])


@@ -970,8 +953,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal [b, d, e, a], new_way.nds
     assert_equal({ "test" => "newer" }, new_way.tags)
 
     assert_equal [b, d, e, a], new_way.nds
     assert_equal({ "test" => "newer" }, new_way.tags)
 

-    amf_content "putway", "/1", ["#{user.email}:test", cs_id, 0, -1, [b, -1, d, e], { "test" => "newest" }, [[4.56, 12.34, -1, 0, { "test" => "new" }], [12.34, 4.56, d, 1, { "test" => "ok" }]], { a => 1 }]
-    post :amf_write
+    post :amf_write, :body => amf_content("putway", "/1", ["#{user.email}:test", cs_id, 0, -1, [b, -1, d, e], { "test" => "newest" }, [[4.56, 12.34, -1, 0, { "test" => "new" }], [12.34, 4.56, d, 1, { "test" => "ok" }]], { a => 1 }])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -981,8 +963,8 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal 8, result.size
     assert_equal 0, result[0]
     assert_equal "", result[1]
     assert_equal 8, result.size
     assert_equal 0, result[0]
     assert_equal "", result[1]

-    assert_equal -1, result[2]
-    assert_not_equal -1, result[3]
+    assert_equal(-1, result[2])
+    assert_not_equal(-1, result[3])

     assert_equal({ "-1" => new_node_id }, result[4])
     assert_equal 1, result[5]
     assert_equal({ new_node_id.to_s => 1, d.to_s => 2 }, result[6])
     assert_equal({ "-1" => new_node_id }, result[4])
     assert_equal 1, result[5]
     assert_equal({ new_node_id.to_s => 1, d.to_s => 2 }, result[6])


@@ -1020,8 +1002,7 @@ class AmfControllerTest < ActionController::TestCase
     user = way.changeset.user
 
     assert_not_equal({ "test" => "ok" }, way.tags)
     user = way.changeset.user
 
     assert_not_equal({ "test" => "ok" }, way.tags)

-    amf_content "putway", "/1", ["#{user.email}:test", cs_id, way.version, way.id, way.nds, { "test" => "ok" }, [], {}]
-    post :amf_write
+    post :amf_write, :body => amf_content("putway", "/1", ["#{user.email}:test", cs_id, way.version, way.id, way.nds, { "test" => "ok" }, [], {}])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -1048,8 +1029,7 @@ class AmfControllerTest < ActionController::TestCase
     d = create(:node).id
 
     assert_not_equal [a, b, c, d], way.nds
     d = create(:node).id
 
     assert_not_equal [a, b, c, d], way.nds

-    amf_content "putway", "/1", ["#{user.email}:test", cs_id, way.version + 1, way.id, [a, b, c, d], way.tags, [], {}]
-    post :amf_write
+    post :amf_write, :body => amf_content("putway", "/1", ["#{user.email}:test", cs_id, way.version + 1, way.id, [a, b, c, d], way.tags, [], {}])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -1069,8 +1049,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal [a, b, c, d], new_way.nds
     assert_equal way.tags, new_way.tags
 
     assert_equal [a, b, c, d], new_way.nds
     assert_equal way.tags, new_way.tags
 

-    amf_content "putway", "/1", ["#{user.email}:test", cs_id, way.version + 2, way.id, [a, -1, b, c], way.tags, [[4.56, 12.34, -1, 0, { "test" => "new" }], [12.34, 4.56, b, 1, { "test" => "ok" }]], { d => 1 }]
-    post :amf_write
+    post :amf_write, :body => amf_content("putway", "/1", ["#{user.email}:test", cs_id, way.version + 2, way.id, [a, -1, b, c], way.tags, [[4.56, 12.34, -1, 0, { "test" => "new" }], [12.34, 4.56, b, 1, { "test" => "ok" }]], { d => 1 }])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -1126,8 +1105,7 @@ class AmfControllerTest < ActionController::TestCase
     create(:way_node, :node => b)
     c = way.nodes[2]
 
     create(:way_node, :node => b)
     c = way.nodes[2]
 

-    amf_content "deleteway", "/1", ["#{user.email}:test", cs_id, way.id, way.version, nodes]
-    post :amf_write
+    post :amf_write, :body => amf_content("deleteway", "/1", ["#{user.email}:test", cs_id, way.id, way.version, nodes])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -1156,15 +1134,14 @@ class AmfControllerTest < ActionController::TestCase
     cs_id = way.changeset.id
     user = way.changeset.user
 
     cs_id = way.changeset.id
     user = way.changeset.user
 

-    amf_content "deleteway", "/1", ["#{user.email}:test", cs_id, way.id, way.version, nodes]
-    post :amf_write
+    post :amf_write, :body => amf_content("deleteway", "/1", ["#{user.email}:test", cs_id, way.id, way.version, nodes])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 2, result.size
     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 2, result.size

-    assert_equal -1, result[0]
-    assert_match /Way #{way.id} is still used/, result[1]
+    assert_equal(-1, result[0])
+    assert_match(/Way #{way.id} is still used/, result[1])

 
     new_way = Way.find(way.id)
     assert_equal way.version, new_way.version
 
     new_way = Way.find(way.id)
     assert_equal way.version, new_way.version


@@ -1185,8 +1162,7 @@ class AmfControllerTest < ActionController::TestCase
     way = create(:way_with_nodes, :nodes_count => 2)
     relation = create(:relation)
 
     way = create(:way_with_nodes, :nodes_count => 2)
     relation = create(:relation)
 

-    amf_content "putrelation", "/1", ["#{user.email}:test", cs_id, 0, -1, { "test" => "new" }, [["Node", node.id, "node"], ["Way", way.id, "way"], ["Relation", relation.id, "relation"]], true]
-    post :amf_write
+    post :amf_write, :body => amf_content("putrelation", "/1", ["#{user.email}:test", cs_id, 0, -1, { "test" => "new" }, [["Node", node.id, "node"], ["Way", way.id, "way"], ["Relation", relation.id, "relation"]], true])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -1195,8 +1171,8 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal 5, result.size
     assert_equal 0, result[0]
     assert_equal "", result[1]
     assert_equal 5, result.size
     assert_equal 0, result[0]
     assert_equal "", result[1]

-    assert_equal -1, result[2]
-    assert_not_equal -1, result[3]
+    assert_equal(-1, result[2])
+    assert_not_equal(-1, result[3])

     assert_equal 1, result[4]
 
     new_relation = Relation.find(new_relation_id)
     assert_equal 1, result[4]
 
     new_relation = Relation.find(new_relation_id)


@@ -1214,8 +1190,7 @@ class AmfControllerTest < ActionController::TestCase
     cs_id = relation.changeset.id
 
     assert_not_equal({ "test" => "ok" }, relation.tags)
     cs_id = relation.changeset.id
 
     assert_not_equal({ "test" => "ok" }, relation.tags)

-    amf_content "putrelation", "/1", ["#{user.email}:test", cs_id, relation.version, relation.id, { "test" => "ok" }, relation.members, true]
-    post :amf_write
+    post :amf_write, :body => amf_content("putrelation", "/1", ["#{user.email}:test", cs_id, relation.version, relation.id, { "test" => "ok" }, relation.members, true])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -1236,11 +1211,13 @@ class AmfControllerTest < ActionController::TestCase
 
   # check that we can delete a relation
   def test_putrelation_delete_valid
 
   # check that we can delete a relation
   def test_putrelation_delete_valid

-    relation = current_relations(:visible_relation)
-    cs_id = changesets(:public_user_first_change).id
+    relation = create(:relation)
+    create(:relation_member, :relation => relation)
+    create(:relation_tag, :relation => relation)
+    cs_id = relation.changeset.id
+    user = relation.changeset.user

 
 

-    amf_content "putrelation", "/1", ["test@example.com:test", cs_id, relation.version, relation.id, relation.tags, relation.members, false]
-    post :amf_write
+    post :amf_write, :body => amf_content("putrelation", "/1", ["#{user.email}:test", cs_id, relation.version, relation.id, relation.tags, relation.members, false])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -1261,18 +1238,20 @@ class AmfControllerTest < ActionController::TestCase
 
   # check that we can't delete a relation that is in use
   def test_putrelation_delete_inuse
 
   # check that we can't delete a relation that is in use
   def test_putrelation_delete_inuse

-    relation = current_relations(:public_used_relation)
-    cs_id = changesets(:public_user_first_change).id
+    relation = create(:relation)
+    super_relation = create(:relation)
+    create(:relation_member, :relation => super_relation, :member => relation)
+    cs_id = relation.changeset.id
+    user = relation.changeset.user

 
 

-    amf_content "putrelation", "/1", ["test@example.com:test", cs_id, relation.version, relation.id, relation.tags, relation.members, false]
-    post :amf_write
+    post :amf_write, :body => amf_content("putrelation", "/1", ["#{user.email}:test", cs_id, relation.version, relation.id, relation.tags, relation.members, false])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 2, result.size
     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 2, result.size

-    assert_equal -1, result[0]
-    assert_match /relation #{relation.id} is used in/, result[1]
+    assert_equal(-1, result[0])
+    assert_match(/relation #{relation.id} is used in/, result[1])

 
     new_relation = Relation.find(relation.id)
     assert_equal relation.version, new_relation.version
 
     new_relation = Relation.find(relation.id)
     assert_equal relation.version, new_relation.version


@@ -1283,8 +1262,9 @@ class AmfControllerTest < ActionController::TestCase
 
   # check that we can open a changeset
   def test_startchangeset_valid
 
   # check that we can open a changeset
   def test_startchangeset_valid

-    amf_content "startchangeset", "/1", ["test@example.com:test", { "source" => "new" }, nil, "new", 1]
-    post :amf_write
+    user = create(:user)
+
+    post :amf_write, :body => amf_content("startchangeset", "/1", ["#{user.email}:test", { "source" => "new" }, nil, "new", 1])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -1300,8 +1280,7 @@ class AmfControllerTest < ActionController::TestCase
 
     old_cs_id = new_cs_id
 
 
     old_cs_id = new_cs_id
 

-    amf_content "startchangeset", "/1", ["test@example.com:test", { "source" => "newer" }, old_cs_id, "newer", 1]
-    post :amf_write
+    post :amf_write, :body => amf_content("startchangeset", "/1", ["#{user.email}:test", { "source" => "newer" }, old_cs_id, "newer", 1])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -1323,8 +1302,7 @@ class AmfControllerTest < ActionController::TestCase
 
     old_cs_id = new_cs_id
 
 
     old_cs_id = new_cs_id
 

-    amf_content "startchangeset", "/1", ["test@example.com:test", {}, old_cs_id, "", 0]
-    post :amf_write
+    post :amf_write, :body => amf_content("startchangeset", "/1", ["#{user.email}:test", {}, old_cs_id, "", 0])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -1341,8 +1319,10 @@ class AmfControllerTest < ActionController::TestCase
 
   # check that we can't close somebody elses changeset
   def test_startchangeset_invalid_wrong_user
 
   # check that we can't close somebody elses changeset
   def test_startchangeset_invalid_wrong_user

-    amf_content "startchangeset", "/1", ["test@example.com:test", { "source" => "new" }, nil, "new", 1]
-    post :amf_write
+    user = create(:user)
+    user2 = create(:user)
+
+    post :amf_write, :body => amf_content("startchangeset", "/1", ["#{user.email}:test", { "source" => "new" }, nil, "new", 1])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -1356,14 +1336,13 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal true, cs.is_open?
     assert_equal({ "comment" => "new", "source" => "new" }, cs.tags)
 
     assert_equal true, cs.is_open?
     assert_equal({ "comment" => "new", "source" => "new" }, cs.tags)
 

-    amf_content "startchangeset", "/1", ["test@openstreetmap.org:test", {}, cs_id, "delete", 0]
-    post :amf_write
+    post :amf_write, :body => amf_content("startchangeset", "/1", ["#{user2.email}:test", {}, cs_id, "delete", 0])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 2, result.size
     assert_response :success
     amf_parse_response
     result = amf_result("/1")
 
     assert_equal 2, result.size

-    assert_equal -2, result[0]
+    assert_equal(-2, result[0])

     assert_equal "The user doesn't own that changeset", result[1]
 
     cs = Changeset.find(cs_id)
     assert_equal "The user doesn't own that changeset", result[1]
 
     cs = Changeset.find(cs_id)


@@ -1373,11 +1352,12 @@ class AmfControllerTest < ActionController::TestCase
 
   # check that invalid characters are stripped from changeset tags
   def test_startchangeset_invalid_xmlchar_comment
 
   # check that invalid characters are stripped from changeset tags
   def test_startchangeset_invalid_xmlchar_comment

+    user = create(:user)
+

     invalid = "\035\022"
     comment = "foo#{invalid}bar"
 
     invalid = "\035\022"
     comment = "foo#{invalid}bar"
 

-    amf_content "startchangeset", "/1", ["test@example.com:test", {}, nil, comment, 1]
-    post :amf_write
+    post :amf_write, :body => amf_content("startchangeset", "/1", ["#{user.email}:test", {}, nil, comment, 1])

     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")


@@ -1417,7 +1397,7 @@ class AmfControllerTest < ActionController::TestCase
     c.write [-1].pack("N")
     c.write AMF.encodevalue(data)
 
     c.write [-1].pack("N")
     c.write AMF.encodevalue(data)
 

-    @request.env["RAW_POST_DATA"] = c.string
+    c.string

   end
 
   # Parses the @response object as an AMF messsage.
   end
 
   # Parses the @response object as an AMF messsage.


@@ -1456,8 +1436,7 @@ class AmfControllerTest < ActionController::TestCase
   # caller's block for assertion testing.
   def check_bboxes_are_bad(bboxes)
     bboxes.each do |bbox|
   # caller's block for assertion testing.
   def check_bboxes_are_bad(bboxes)
     bboxes.each do |bbox|

-      amf_content "whichways", "/1", bbox
-      post :amf_read
+      post :amf_read, :body => amf_content("whichways", "/1", bbox)

       assert_response :success
       amf_parse_response
 
       assert_response :success
       amf_parse_response