Merge 14394:14533 from trunk.

[rails.git] / test / functional / api_controller_test.rb

diff --git a/test/functional/api_controller_test.rb b/test/functional/api_controller_test.rb
index a8e8087166cb3bbf975a5dffab51717ed98b8d38..9056931b95f700af970c2b338e7fd7ce98f59e16 100644 (file)
--- 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
 
     # 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.
   # -------------------------------------
   # -------------------------------------
   # Test reading a bounding box.
   # -------------------------------------


@@ -151,16 +147,17 @@ class ApiControllerTest < ActionController::TestCase
   #  end
   #end
   
   #  end
   #end
   

-  # MySQL requires that the C based functions are installed for this test to 
-  # work. More information is available from:
+  # 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/index.php/Rails#Installing_the_quadtile_functions
   # http://wiki.openstreetmap.org/index.php/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
   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
     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,7 +178,7 @@ class ApiControllerTest < ActionController::TestCase
     1.upto(16) do |zoom|
       get :changes, :zoom => zoom
       assert_response :success
     1.upto(16) do |zoom|
       get :changes, :zoom => zoom
       assert_response :success

-      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
       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