Convert note view to use server side conditions

[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 83ef03bbf95cc4fb1d31dc1d2169eb5c6153d1d7..bd7a518843ef8237fa6140773e199e2fa0f92818 100644 (file)
--- a/test/controllers/amf_controller_test.rb
+++ b/test/controllers/amf_controller_test.rb
@@ -1,8 +1,9 @@
 require "test_helper"
 require "stringio"
 require "test_helper"
 require "stringio"

-include Potlatch

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

+  include Potlatch
+

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


@@ -730,8 +731,8 @@ 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
+    lat = rand(-50..49) + rand
+    lon = rand(-50..49) + rand

 
     changeset = create(:changeset)
     user = changeset.user
 
     changeset = create(:changeset)
     user = changeset.user


@@ -770,8 +771,8 @@ 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
+    lat = rand(-50..49) + rand
+    lon = rand(-50..49) + rand

 
     amf_content "putpoi", "/2", ["#{user.email}:test", changeset.id, nil, nil, lon, lat, { "key" => "value", "ping" => "pong" }, nil]
     post :amf_write
 
     amf_content "putpoi", "/2", ["#{user.email}:test", changeset.id, nil, nil, lon, lat, { "key" => "value", "ping" => "pong" }, nil]
     post :amf_write


@@ -811,8 +812,8 @@ 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
+    lat = rand(-50..49) + rand
+    lon = rand(-50..49) + rand

 
     changeset = create(:changeset)
     user = changeset.user
 
     changeset = create(:changeset)
     user = changeset.user


@@ -847,8 +848,8 @@ 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
+    lat = rand(-50..49) + rand
+    lon = rand(-50..49) + rand

 
     changeset = create(:changeset)
     user = changeset.user
 
     changeset = create(:changeset)
     user = changeset.user