X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bf29550db840c97cafffbe1e836750bef6c7942d..bec2340a448d2eaa9ffe2e2ca1980b31ae73c342:/test/functional/api_controller_test.rb?ds=inline

diff --git a/test/functional/api_controller_test.rb b/test/functional/api_controller_test.rb
index 6a0c2e2ac..866c7bd27 100644
--- a/test/functional/api_controller_test.rb
+++ b/test/functional/api_controller_test.rb
@@ -18,10 +18,6 @@ class ApiControllerTest < ActionController::TestCase
     # reall reject it, however this is to test to see if the api changes.
   end
 
-  def basic_authorization(user, pass)
-    @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
-  end
-
   # -------------------------------------
   # Test reading a bounding box.
   # -------------------------------------
@@ -45,7 +41,7 @@ class ApiControllerTest < ActionController::TestCase
       assert_select "bounds[minlon=#{minlon}][minlat=#{minlat}][maxlon=#{maxlon}][maxlat=#{maxlat}]", :count => 1
       assert_select "node[id=#{node.id}][lat=#{node.lat}][lon=#{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=test][v=1]"
+        assert_select "tag[k='test'][v='yes']"
       end
       # Should also test for the ways and relation
     end
@@ -63,7 +59,7 @@ class ApiControllerTest < ActionController::TestCase
   end
   
   def test_tracepoints
-    point = gpx_files(:first_trace_file)
+    point = gpx_files(:public_trace_file)
     minlon = point.longitude-0.1
     minlat = point.latitude-0.1
     maxlon = point.longitude+0.1
@@ -151,16 +147,17 @@ class ApiControllerTest < ActionController::TestCase
   #  end
   #end
   
-  # MySQL requires that the C based functions are installed for this test to 
-  # work. More information is available from:
-  # http://wiki.openstreetmap.org/index.php/Rails#Installing_the_quadtile_functions
+  # MySQL and Postgres require that the C based functions are installed for 
+  # this test to work. More information is available from:
+  # http://wiki.openstreetmap.org/wiki/Rails#Installing_the_quadtile_functions
+  # or by looking at the readme in db/README
   def test_changes_simple
     get :changes
     assert_response :success
     #print @response.body
     # As we have loaded the fixtures, we can assume that there are no 
     # changes recently
-    now = Time.now
+    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
@@ -181,11 +178,10 @@ class ApiControllerTest < ActionController::TestCase
     1.upto(16) do |zoom|
       get :changes, :zoom => zoom
       assert_response :success
-      now = Time.now
-      hourago = now - 1.hour
-      # Note that this may fail on a very slow machine, so isn't a great test
+      # NOTE: there was a test here for the timing, but it was too sensitive to be a good test
+      # and it was annoying.
       assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']:root", :count => 1 do
-        assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1
+        assert_select "changes", :count => 1
       end
     end
   end
@@ -222,6 +218,7 @@ class ApiControllerTest < ActionController::TestCase
         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 "changesets[maximum_elements=#{Changeset::MAX_ELEMENTS}]", :count => 1
       end
     end
   end