Merge branch 'master' into cancancan

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

diff --git a/test/controllers/node_controller_test.rb b/test/controllers/node_controller_test.rb
index f2ef39dff3f63cdddb4eae6e3e50970c492d0970..5f737f798a57c26a0a102739bfe62a013baa2ed7 100644 (file)
--- a/test/controllers/node_controller_test.rb
+++ b/test/controllers/node_controller_test.rb
@@ -33,8 +33,8 @@ class NodeControllerTest < ActionController::TestCase
     changeset = create(:changeset, :user => user)
 
     # create a node with random lat/lon
     changeset = create(:changeset, :user => user)
 
     # create a node with random lat/lon

-    lat = rand(100) - 50 + rand
-    lon = rand(100) - 50 + rand
+    lat = rand(-50..50) + rand
+    lon = rand(-50..50) + rand

 
     ## First try with no auth
     # create a minimal xml file
 
     ## First try with no auth
     # create a minimal xml file


@@ -455,7 +455,7 @@ class NodeControllerTest < ActionController::TestCase
     end
 
     # check error when a non-existent node is included
     end
 
     # check error when a non-existent node is included

-    get :nodes, :params => { :nodes => "#{node1.id},#{node2.id},#{node3.id},#{node4.id},#{node5.id},400" }
+    get :nodes, :params => { :nodes => "#{node1.id},#{node2.id},#{node3.id},#{node4.id},#{node5.id},0" }

     assert_response :not_found
   end
 
     assert_response :not_found
   end
 


@@ -496,8 +496,8 @@ class NodeControllerTest < ActionController::TestCase
 
     # try and put something into a string that the API might
     # use unquoted and therefore allow code injection...
 
     # try and put something into a string that the API might
     # use unquoted and therefore allow code injection...

-    content "<osm><node lat='0' lon='0' changeset='#{private_changeset.id}'>" +
-            '<tag k="#{@user.inspect}" v="0"/>' +
+    content "<osm><node lat='0' lon='0' changeset='#{private_changeset.id}'>" \
+            '<tag k="#{@user.inspect}" v="0"/>' \

             "</node></osm>"
     put :create
     assert_require_public_data "Shouldn't be able to create with non-public user"
             "</node></osm>"
     put :create
     assert_require_public_data "Shouldn't be able to create with non-public user"


@@ -507,8 +507,8 @@ class NodeControllerTest < ActionController::TestCase
 
     # try and put something into a string that the API might
     # use unquoted and therefore allow code injection...
 
     # try and put something into a string that the API might
     # use unquoted and therefore allow code injection...

-    content "<osm><node lat='0' lon='0' changeset='#{changeset.id}'>" +
-            '<tag k="#{@user.inspect}" v="0"/>' +
+    content "<osm><node lat='0' lon='0' changeset='#{changeset.id}'>" \
+            '<tag k="#{@user.inspect}" v="0"/>' \

             "</node></osm>"
     put :create
     assert_response :success
             "</node></osm>"
     put :create
     assert_response :success