From: Tom Hughes <tom@compton.nu>
Date: Thu, 16 Apr 2015 14:46:47 +0000 (+0100)
Subject: Avoid using Time.parse as it is affected by the TZ variable
X-Git-Tag: live~4110
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b0ed60617330a7e9758cd1d5adcb89fc64b1f6fd?hp=dd4e7667885db46bc24a79be6431e27cdad13b07

Avoid using Time.parse as it is affected by the TZ variable
---

diff --git a/test/controllers/api_controller_test.rb b/test/controllers/api_controller_test.rb
index 178eecc65..d10e5277e 100644
--- a/test/controllers/api_controller_test.rb
+++ b/test/controllers/api_controller_test.rb
@@ -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