Merge remote-tracking branch 'openstreetmap/pull/1004'
[rails.git] / test / controllers / api_controller_test.rb
index 178eecc6542c8cdebd67f034fdabadf99943e020..0a185baae3ebed1808a3bc7a5ea47814b8727132 100644 (file)
@@ -6,14 +6,14 @@ class ApiControllerTest < ActionController::TestCase
 
   def setup
     super
-    @badbigbbox = %w(-0.1,-0.1,1.1,1.1  10,10,11,11)
-    @badmalformedbbox = %w(-0.1  hello
+    @badbigbbox = %w(-0.1,-0.1,1.1,1.1 10,10,11,11)
+    @badmalformedbbox = %w(-0.1 hello
                            10N2W10.1N2.1W)
-    @badlatmixedbbox = %w(0,0.1,0.1,0  -0.1,80,0.1,70  0.24,54.34,0.25,54.33)
-    @badlonmixedbbox = %w(80,-0.1,70,0.1  54.34,0.24,54.33,0.25)
+    @badlatmixedbbox = %w(0,0.1,0.1,0 -0.1,80,0.1,70 0.24,54.34,0.25,54.33)
+    @badlonmixedbbox = %w(80,-0.1,70,0.1 54.34,0.24,54.33,0.25)
     # @badlatlonoutboundsbbox = %w{ 191,-0.1,193,0.1  -190.1,89.9,-190,90 }
-    @goodbbox = %w(-0.1,-0.1,0.1,0.1  51.1,-0.1,51.2,0
-                   -0.1,%20-0.1,%200.1,%200.1  -0.1edcd,-0.1d,0.1,0.1  -0.1E,-0.1E,0.1S,0.1N S0.1,W0.1,N0.1,E0.1)
+    @goodbbox = %w(-0.1,-0.1,0.1,0.1 51.1,-0.1,51.2,0
+                   -0.1,%20-0.1,%200.1,%200.1 -0.1edcd,-0.1d,0.1,0.1 -0.1E,-0.1E,0.1S,0.1N S0.1,W0.1,N0.1,E0.1)
     # That last item in the goodbbox really shouldn't be there, as the API should
     # reall reject it, however this is to test to see if the api changes.
   end
@@ -269,7 +269,7 @@ 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"))
+    Timecop.freeze(Time.utc(2010, 4, 3, 10, 55, 0))
     get :changes
     assert_response :success
     # print @response.body
@@ -284,7 +284,7 @@ class ApiControllerTest < ActionController::TestCase
     end
     Timecop.return
 
-    Timecop.freeze(Time.parse("2007-01-01 00:30:00"))
+    Timecop.freeze(Time.utc(2007, 1, 1, 0, 30, 0))
     get :changes
     assert_response :success
     # print @response.body
@@ -385,7 +385,7 @@ class ApiControllerTest < ActionController::TestCase
   end
 
   def test_permissions_oauth
-    @request.env["oauth.token"] =  AccessToken.new do |token|
+    @request.env["oauth.token"] = AccessToken.new do |token|
       # Just to test a few
       token.allow_read_prefs = true
       token.allow_write_api = true