X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5b33f3f8e31c62bc3e5db1d5b120533c3afdde68..43c09d8062fc4aef4f1e0e5d3598e526a02bb288:/test/controllers/api_controller_test.rb?ds=inline

diff --git a/test/controllers/api_controller_test.rb b/test/controllers/api_controller_test.rb
index 61763d128..cdc20a1aa 100644
--- a/test/controllers/api_controller_test.rb
+++ b/test/controllers/api_controller_test.rb
@@ -1,5 +1,4 @@
 require "test_helper"
-require "api_controller"
 
 class ApiControllerTest < ActionController::TestCase
   def setup
@@ -63,14 +62,14 @@ class ApiControllerTest < ActionController::TestCase
     maxlon = node.lon + 0.1
     maxlat = node.lat + 0.1
     bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}"
-    get :map, :bbox => bbox
+    get :map, :params => { :bbox => bbox }
     if $VERBOSE
       print @request.to_yaml
       print @response.body
     end
     assert_response :success, "Expected scucess with the map call"
     assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
-      assert_select "bounds[minlon='#{minlon}'][minlat='#{minlat}'][maxlon='#{maxlon}'][maxlat='#{maxlat}']", :count => 1
+      assert_select "bounds[minlon='#{format('%.7f', minlon)}'][minlat='#{format('%.7f', minlat)}'][maxlon='#{format('%.7f', maxlon)}'][maxlat='#{format('%.7f', maxlat)}']", :count => 1
       assert_select "node[id='#{node.id}'][lat='#{format('%.7f', node.lat)}'][lon='#{format('%.7f', node.lon)}'][version='#{node.version}'][changeset='#{node.changeset_id}'][visible='#{node.visible}'][timestamp='#{node.timestamp.xmlschema}']", :count => 1 do
         # This should really be more generic
         assert_select "tag[k='#{tag.k}'][v='#{tag.v}']"
@@ -93,7 +92,7 @@ class ApiControllerTest < ActionController::TestCase
     relation = create(:relation_member, :member => node).relation
 
     bbox = "#{node.lon},#{node.lat},#{node.lon},#{node.lat}"
-    get :map, :bbox => bbox
+    get :map, :params => { :bbox => bbox }
     assert_response :success, "The map call should have succeeded"
     assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
       assert_select "bounds[minlon='#{node.lon}'][minlat='#{node.lat}'][maxlon='#{node.lon}'][maxlat='#{node.lat}']", :count => 1
@@ -121,7 +120,7 @@ class ApiControllerTest < ActionController::TestCase
     relation = create(:relation_member, :member => way1).relation
 
     bbox = "#{node.lon},#{node.lat},#{node.lon},#{node.lat}"
-    get :map, :bbox => bbox
+    get :map, :params => { :bbox => bbox }
     assert_response :success, "The map call should have succeeded"
     assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
       assert_select "bounds[minlon='#{node.lon}'][minlat='#{node.lat}'][maxlon='#{node.lon}'][maxlat='#{node.lat}']", :count => 1
@@ -138,10 +137,10 @@ class ApiControllerTest < ActionController::TestCase
   end
 
   def test_map_empty
-    get :map, :bbox => "179.998,89.998,179.999.1,89.999"
+    get :map, :params => { :bbox => "179.998,89.998,179.999.1,89.999" }
     assert_response :success, "The map call should have succeeded"
     assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
-      assert_select "bounds[minlon='179.998'][minlat='89.998'][maxlon='179.999'][maxlat='89.999']", :count => 1
+      assert_select "bounds[minlon='179.9980000'][minlat='89.9980000'][maxlon='179.9990000'][maxlat='89.9990000']", :count => 1
       assert_select "node", :count => 0
       assert_select "way", :count => 0
       assert_select "relation", :count => 0
@@ -157,7 +156,7 @@ class ApiControllerTest < ActionController::TestCase
     maxlon = point.longitude + 0.001
     maxlat = point.latitude + 0.001
     bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}"
-    get :trackpoints, :bbox => bbox
+    get :trackpoints, :params => { :bbox => bbox }
     assert_response :success
     assert_select "gpx[version='1.0'][creator='OpenStreetMap.org']", :count => 1 do
       assert_select "trk" do
@@ -176,7 +175,7 @@ class ApiControllerTest < ActionController::TestCase
     maxlon = point.longitude + 0.002
     maxlat = point.latitude + 0.002
     bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}"
-    get :trackpoints, :bbox => bbox
+    get :trackpoints, :params => { :bbox => bbox }
     assert_response :success
     assert_select "gpx[version='1.0'][creator='OpenStreetMap.org']", :count => 1 do
       assert_select "trk", :count => 1 do
@@ -200,7 +199,7 @@ class ApiControllerTest < ActionController::TestCase
     maxlon = point.longitude + 0.002
     maxlat = point.latitude + 0.002
     bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}"
-    get :trackpoints, :bbox => bbox
+    get :trackpoints, :params => { :bbox => bbox }
     assert_response :success
     assert_select "gpx[version='1.0'][creator='OpenStreetMap.org']", :count => 1 do
       assert_select "trk", :count => 1 do
@@ -226,12 +225,12 @@ class ApiControllerTest < ActionController::TestCase
 
   def test_traces_page_less_than_0
     -10.upto(-1) do |i|
-      get :trackpoints, :page => i, :bbox => "-0.1,-0.1,0.1,0.1"
+      get :trackpoints, :params => { :page => i, :bbox => "-0.1,-0.1,0.1,0.1" }
       assert_response :bad_request
       assert_equal "Page number must be greater than or equal to 0", @response.body, "The page number was #{i}"
     end
     0.upto(10) do |i|
-      get :trackpoints, :page => i, :bbox => "-0.1,-0.1,0.1,0.1"
+      get :trackpoints, :params => { :page => i, :bbox => "-0.1,-0.1,0.1,0.1" }
       assert_response :success, "The page number was #{i} and should have been accepted"
     end
   end
@@ -239,7 +238,7 @@ class ApiControllerTest < ActionController::TestCase
   def test_bbox_too_big
     @badbigbbox.each do |bbox|
       %w[trackpoints map].each do |tq|
-        get tq, :bbox => bbox
+        get tq, :params => { :bbox => bbox }
         assert_response :bad_request, "The bbox:#{bbox} was expected to be too big"
         assert_equal "The maximum bbox size is #{MAX_REQUEST_AREA}, and your request was too large. Either request a smaller area, or use planet.osm", @response.body, "bbox: #{bbox}"
       end
@@ -249,7 +248,7 @@ class ApiControllerTest < ActionController::TestCase
   def test_bbox_malformed
     @badmalformedbbox.each do |bbox|
       %w[trackpoints map].each do |tq|
-        get tq, :bbox => bbox
+        get tq, :params => { :bbox => bbox }
         assert_response :bad_request, "The bbox:#{bbox} was expected to be malformed"
         assert_equal "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat", @response.body, "bbox: #{bbox}"
       end
@@ -259,7 +258,7 @@ class ApiControllerTest < ActionController::TestCase
   def test_bbox_lon_mixedup
     @badlonmixedbbox.each do |bbox|
       %w[trackpoints map].each do |tq|
-        get tq, :bbox => bbox
+        get tq, :params => { :bbox => bbox }
         assert_response :bad_request, "The bbox:#{bbox} was expected to have the longitude mixed up"
         assert_equal "The minimum longitude must be less than the maximum longitude, but it wasn't", @response.body, "bbox: #{bbox}"
       end
@@ -269,7 +268,7 @@ class ApiControllerTest < ActionController::TestCase
   def test_bbox_lat_mixedup
     @badlatmixedbbox.each do |bbox|
       %w[trackpoints map].each do |tq|
-        get tq, :bbox => bbox
+        get tq, :params => { :bbox => bbox }
         assert_response :bad_request, "The bbox:#{bbox} was expected to have the latitude mixed up"
         assert_equal "The minimum latitude must be less than the maximum latitude, but it wasn't", @response.body, "bbox: #{bbox}"
       end
@@ -304,38 +303,38 @@ class ApiControllerTest < ActionController::TestCase
     # nodes with a different timestamp should be ignored
     create(:node, :timestamp => Time.utc(2008, 1, 1, 0, 0, 0), :lat => 7, :lon => 7)
 
-    Timecop.freeze(Time.utc(2010, 4, 3, 10, 55, 0))
-    get :changes
-    assert_response :success
-    now = Time.now.getutc
-    hourago = now - 1.hour
-    assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
-      assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 do
-        assert_select "tile", :count => 0
+    travel_to Time.utc(2010, 4, 3, 10, 55, 0) do
+      get :changes
+      assert_response :success
+      now = Time.now.getutc
+      hourago = now - 1.hour
+      assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
+        assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 do
+          assert_select "tile", :count => 0
+        end
       end
     end
-    Timecop.return
 
-    Timecop.freeze(Time.utc(2007, 1, 1, 0, 30, 0))
-    get :changes
-    assert_response :success
-    # print @response.body
-    # As we have loaded the fixtures, we can assume that there are some
-    # changes at the time we have frozen at
-    now = Time.now.getutc
-    hourago = now - 1.hour
-    assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
-      assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 do
-        assert_select "tile", :count => 6
+    travel_to Time.utc(2007, 1, 1, 0, 30, 0) do
+      get :changes
+      assert_response :success
+      # print @response.body
+      # As we have loaded the fixtures, we can assume that there are some
+      # changes at the time we have frozen at
+      now = Time.now.getutc
+      hourago = now - 1.hour
+      assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
+        assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 do
+          assert_select "tile", :count => 6
+        end
       end
     end
-    Timecop.return
   end
 
   def test_changes_zoom_invalid
     zoom_to_test = %w[p -1 0 17 one two]
     zoom_to_test.each do |zoom|
-      get :changes, :zoom => zoom
+      get :changes, :params => { :zoom => zoom }
       assert_response :bad_request
       assert_equal @response.body, "Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours"
     end
@@ -343,7 +342,7 @@ class ApiControllerTest < ActionController::TestCase
 
   def test_changes_zoom_valid
     1.upto(16) do |zoom|
-      get :changes, :zoom => zoom
+      get :changes, :params => { :zoom => zoom }
       assert_response :success
       # NOTE: there was a test here for the timing, but it was too sensitive to be a good test
       # and it was annoying.
@@ -356,7 +355,7 @@ class ApiControllerTest < ActionController::TestCase
   def test_changes_hours_invalid
     invalid = %w[-21 335 -1 0 25 26 100 one two three ping pong :]
     invalid.each do |hour|
-      get :changes, :hours => hour
+      get :changes, :params => { :hours => hour }
       assert_response :bad_request, "Problem with the hour: #{hour}"
       assert_equal @response.body, "Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours", "Problem with the hour: #{hour}."
     end
@@ -364,19 +363,19 @@ class ApiControllerTest < ActionController::TestCase
 
   def test_changes_hours_valid
     1.upto(24) do |hour|
-      get :changes, :hours => hour
+      get :changes, :params => { :hours => hour }
       assert_response :success
     end
   end
 
   def test_changes_start_end_invalid
-    get :changes, :start => "2010-04-03 10:55:00", :end => "2010-04-03 09:55:00"
+    get :changes, :params => { :start => "2010-04-03 10:55:00", :end => "2010-04-03 09:55:00" }
     assert_response :bad_request
     assert_equal @response.body, "Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours"
   end
 
   def test_changes_start_end_valid
-    get :changes, :start => "2010-04-03 09:55:00", :end => "2010-04-03 10:55:00"
+    get :changes, :params => { :start => "2010-04-03 09:55:00", :end => "2010-04-03 10:55:00" }
     assert_response :success
   end
 
@@ -406,7 +405,7 @@ class ApiControllerTest < ActionController::TestCase
   end
 
   def test_permissions_basic_auth
-    basic_authorization(create(:user).email, "test")
+    basic_authorization create(:user).email, "test"
     get :permissions
     assert_response :success
     assert_select "osm > permissions", :count => 1 do