X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/565171486f6d90321e0291d5ccc3cf6a1c12e730..b5e28f092fd1620cbd1005e17bcf6b77e086a317:/test/functional/api_controller_test.rb?ds=sidebyside diff --git a/test/functional/api_controller_test.rb b/test/functional/api_controller_test.rb index ce4020ca7..098026a93 100644 --- a/test/functional/api_controller_test.rb +++ b/test/functional/api_controller_test.rb @@ -66,9 +66,8 @@ class ApiControllerTest < ActionController::TestCase maxlat = point.latitude+0.001 bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}" get :trackpoints, :bbox => bbox - #print @response.body assert_response :success - assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0/]:root", :count => 1 do + assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0]:root", :count => 1 do assert_select "trk" do assert_select "trkseg" end @@ -83,9 +82,8 @@ class ApiControllerTest < ActionController::TestCase maxlat = point.latitude+0.002 bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}" get :trackpoints, :bbox => bbox - #print @response.body assert_response :success - assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0/]:root", :count => 1 do + assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0]:root", :count => 1 do assert_select "trk", :count => 1 do assert_select "trk > trkseg", :count => 2 do |trksegs| trksegs.each do |trkseg| @@ -106,9 +104,8 @@ class ApiControllerTest < ActionController::TestCase maxlat = point.latitude+0.002 bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}" get :trackpoints, :bbox => bbox - #print @response.body assert_response :success - assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0/]:root", :count => 1 do + assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0]:root", :count => 1 do assert_select "trk", :count => 1 do assert_select "trk>name", :count => 1 assert_select "trk>desc", :count => 1 @@ -147,7 +144,7 @@ class ApiControllerTest < ActionController::TestCase [ "trackpoints", "map" ].each do |tq| get tq, :bbox => bbox assert_response :bad_request, "The bbox:#{bbox} was expected to be too big" - assert_equal "The maximum bbox size is #{APP_CONFIG['max_request_area']}, and your request was too large. Either request a smaller area, or use planet.osm", @response.body, "bbox: #{bbox}" + 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 end end @@ -199,17 +196,18 @@ class ApiControllerTest < ActionController::TestCase # http://wiki.openstreetmap.org/wiki/Rails#Installing_the_quadtile_functions # or by looking at the readme in db/README def test_changes_simple + Timecop.freeze(Time.parse('2010-04-03 10:55:00')) get :changes assert_response :success #print @response.body # As we have loaded the fixtures, we can assume that there are no - # changes recently + # changes at the time we have frozen at now = Time.now.getutc hourago = now - 1.hour - # Note that this may fail on a very slow machine, so isn't a great test assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']:root", :count => 1 do assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 end + Timecop.return end def test_changes_zoom_invalid @@ -263,8 +261,8 @@ class ApiControllerTest < ActionController::TestCase assert_select "osm:root[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do assert_select "api", :count => 1 do assert_select "version[minimum=#{API_VERSION}][maximum=#{API_VERSION}]", :count => 1 - assert_select "area[maximum=#{APP_CONFIG['max_request_area']}]", :count => 1 - assert_select "tracepoints[per_page=#{APP_CONFIG['tracepoints_per_page']}]", :count => 1 + assert_select "area[maximum=#{MAX_REQUEST_AREA}]", :count => 1 + assert_select "tracepoints[per_page=#{TRACEPOINTS_PER_PAGE}]", :count => 1 assert_select "changesets[maximum_elements=#{Changeset::MAX_ELEMENTS}]", :count => 1 end end