Remove link_to_if since it's in a clause with the same condition

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

diff --git a/test/controllers/api/amf_controller_test.rb b/test/controllers/api/amf_controller_test.rb
index c62c750b68f7c8e55fa37f80f7af197773f54cfd..47cced6ff2bb347a58d767bc218ae74ccd175df5 100644 (file)
--- a/test/controllers/api/amf_controller_test.rb
+++ b/test/controllers/api/amf_controller_test.rb
@@ -291,7 +291,7 @@ module Api
       assert_response :success
       amf_parse_response
       rel = amf_result("/1")
       assert_response :success
       amf_parse_response
       rel = amf_result("/1")

-      assert_equal rel[0], 0
+      assert_equal(0, rel[0])

       assert_equal rel[2], id
     end
 
       assert_equal rel[2], id
     end
 


@@ -301,8 +301,8 @@ module Api
       assert_response :success
       amf_parse_response
       rel = amf_result("/1")
       assert_response :success
       amf_parse_response
       rel = amf_result("/1")

-      assert_equal rel[0], -4
-      assert_equal rel[1], "relation"
+      assert_equal(-4, rel[0])
+      assert_equal("relation", rel[1])

       assert_equal rel[2], id
       assert(rel[3].nil?) && rel[4].nil?
     end
       assert_equal rel[2], id
       assert(rel[3].nil?) && rel[4].nil?
     end


@@ -313,8 +313,8 @@ module Api
       assert_response :success
       amf_parse_response
       rel = amf_result("/1")
       assert_response :success
       amf_parse_response
       rel = amf_result("/1")

-      assert_equal rel[0], -4
-      assert_equal rel[1], "relation"
+      assert_equal(-4, rel[0])
+      assert_equal("relation", rel[1])

       assert_equal rel[2], id
       assert(rel[3].nil?) && rel[4].nil?
     end
       assert_equal rel[2], id
       assert(rel[3].nil?) && rel[4].nil?
     end


@@ -426,8 +426,8 @@ module Api
       history = amf_result("/1")
 
       # ['way',wayid,history]
       history = amf_result("/1")
 
       # ['way',wayid,history]

-      assert_equal history[0], "way"
-      assert_equal history[1], 0
+      assert_equal("way", history[0])
+      assert_equal(0, history[1])

       assert_empty history[2]
     end
 
       assert_empty history[2]
     end
 


@@ -445,8 +445,7 @@ module Api
       # ['node',nodeid,history]
       # note that (as per getway_history) we actually round up
       # to the next second
       # ['node',nodeid,history]
       # note that (as per getway_history) we actually round up
       # to the next second

-      assert_equal history[0], "node",
-                   'first element should be "node"'
+      assert_equal("node", history[0], 'first element should be "node"')

       assert_equal history[1], node.id,
                    "second element should be the input node ID"
       assert_equal history[2].first[0],
       assert_equal history[1], node.id,
                    "second element should be the input node ID"
       assert_equal history[2].first[0],


@@ -464,8 +463,8 @@ module Api
       history = amf_result("/1")
 
       # ['node',nodeid,history]
       history = amf_result("/1")
 
       # ['node',nodeid,history]

-      assert_equal history[0], "node"
-      assert_equal history[1], 0
+      assert_equal("node", history[0])
+      assert_equal(0, history[1])

       assert_empty history[2]
     end
 
       assert_empty history[2]
     end
 


@@ -979,15 +978,15 @@ module Api
       new_node = Node.find(new_node_id)
       assert_equal 1, new_node.version
       assert new_node.visible
       new_node = Node.find(new_node_id)
       assert_equal 1, new_node.version
       assert new_node.visible

-      assert_equal 4.56, new_node.lon
-      assert_equal 12.34, new_node.lat
+      assert_in_delta(4.56, new_node.lon)
+      assert_in_delta(12.34, new_node.lat)

       assert_equal({ "test" => "new" }, new_node.tags)
 
       changed_node = Node.find(d)
       assert_equal 2, changed_node.version
       assert changed_node.visible
       assert_equal({ "test" => "new" }, new_node.tags)
 
       changed_node = Node.find(d)
       assert_equal 2, changed_node.version
       assert changed_node.visible

-      assert_equal 12.34, changed_node.lon
-      assert_equal 4.56, changed_node.lat
+      assert_in_delta(12.34, changed_node.lon)
+      assert_in_delta(4.56, changed_node.lat)

       assert_equal({ "test" => "ok" }, changed_node.tags)
 
       # node is not deleted because our other ways are using it
       assert_equal({ "test" => "ok" }, changed_node.tags)
 
       # node is not deleted because our other ways are using it


@@ -1074,15 +1073,15 @@ module Api
       new_node = Node.find(new_node_id)
       assert_equal 1, new_node.version
       assert new_node.visible
       new_node = Node.find(new_node_id)
       assert_equal 1, new_node.version
       assert new_node.visible

-      assert_equal 4.56, new_node.lon
-      assert_equal 12.34, new_node.lat
+      assert_in_delta(4.56, new_node.lon)
+      assert_in_delta(12.34, new_node.lat)

       assert_equal({ "test" => "new" }, new_node.tags)
 
       changed_node = Node.find(b)
       assert_equal 2, changed_node.version
       assert changed_node.visible
       assert_equal({ "test" => "new" }, new_node.tags)
 
       changed_node = Node.find(b)
       assert_equal 2, changed_node.version
       assert changed_node.visible

-      assert_equal 12.34, changed_node.lon
-      assert_equal 4.56, changed_node.lat
+      assert_in_delta(12.34, changed_node.lon)
+      assert_in_delta(4.56, changed_node.lat)

       assert_equal({ "test" => "ok" }, changed_node.tags)
 
       deleted_node = Node.find(d)
       assert_equal({ "test" => "ok" }, changed_node.tags)
 
       deleted_node = Node.find(d)