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 a380eeb208313f08672104595eef0d188ec72e06..3f316d01224e9d63aae5a3823f89b9f58ff078f0 100644 (file)
--- a/test/functional/node_controller_test.rb
+++ b/test/functional/node_controller_test.rb
@@ -57,7 +57,7 @@ class NodeControllerTest < Test::Unit::TestCase
     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