Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

[rails.git] / test / functional / node_controller_test.rb

diff --git a/test/functional/node_controller_test.rb b/test/functional/node_controller_test.rb
index bd1be9e69931b9cf75fc253da28c9cdd2ff5a344..3f316d01224e9d63aae5a3823f89b9f58ff078f0 100644 (file)
--- a/test/functional/node_controller_test.rb
+++ b/test/functional/node_controller_test.rb
@@ -28,8 +28,8 @@ class NodeControllerTest < Test::Unit::TestCase
     checknode = Node.find(nodeid)
     assert_not_nil checknode, "uploaded node not found in data base after upload"
     # compare values
     checknode = Node.find(nodeid)
     assert_not_nil checknode, "uploaded node not found in data base after upload"
     # compare values

-    assert_in_delta lat, checknode.latitude, 1E-8, "saved node does not match requested latitude"
-    assert_in_delta lon, checknode.longitude, 1E-8, "saved node does not match requested longitude"
+    assert_in_delta lat * 10000000, checknode.latitude, 1, "saved node does not match requested latitude"
+    assert_in_delta lon * 10000000, checknode.longitude, 1, "saved node does not match requested longitude"

     assert_equal users(:normal_user).id, checknode.user_id, "saved node does not belong to user that created it"
     assert_equal true, checknode.visible, "saved node is not visible"
   end
     assert_equal users(:normal_user).id, checknode.user_id, "saved node does not belong to user that created it"
     assert_equal true, checknode.visible, "saved node is not visible"
   end


@@ -57,7 +57,7 @@ class NodeControllerTest < Test::Unit::TestCase
     assert_response :unauthorized
 
     # now set auth
     assert_response :unauthorized
 
     # now set auth

-    basic_authorization("test@openstreetmap.org", "test");  
+    basic_authorization(users(:normal_user).email, "test");  

 
     # this should work
     delete :delete, :id => current_nodes(:visible_node).id
 
     # this should work
     delete :delete, :id => current_nodes(:visible_node).id