From: Tom Hughes <tom@compton.nu>
Date: Mon, 10 Jul 2017 20:19:22 +0000 (+0100)
Subject: Replace timecop with the rails builtin travel_to method
X-Git-Tag: live~3867
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/28bfaa9fb6aeefb3264ebcb0e032c047f0288904

Replace timecop with the rails builtin travel_to method
---

diff --git a/Gemfile b/Gemfile
index 4ce4a75f5..baa1dcc04 100644
--- a/Gemfile
+++ b/Gemfile
@@ -113,7 +113,6 @@ group :test do
   gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
   gem "rails-controller-testing"
   gem "rubocop"
-  gem "timecop"
   gem "webmock"
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 556bb8d43..9b79e9ca1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -319,7 +319,6 @@ GEM
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.7)
-    timecop (0.9.0)
     tins (1.14.0)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
@@ -397,11 +396,10 @@ DEPENDENCIES
   sanitize
   sass-rails (~> 5.0)
   secure_headers
-  timecop
   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)
   vendorer
   webmock
 
 BUNDLED WITH
-   1.12.5
+   1.13.7
diff --git a/test/controllers/api_controller_test.rb b/test/controllers/api_controller_test.rb
index efcc06307..9cdbd718c 100644
--- a/test/controllers/api_controller_test.rb
+++ b/test/controllers/api_controller_test.rb
@@ -304,32 +304,32 @@ class ApiControllerTest < ActionController::TestCase
     # nodes with a different timestamp should be ignored
     create(:node, :timestamp => Time.utc(2008, 1, 1, 0, 0, 0), :lat => 7, :lon => 7)
 
-    Timecop.freeze(Time.utc(2010, 4, 3, 10, 55, 0))
-    get :changes
-    assert_response :success
-    now = Time.now.getutc
-    hourago = now - 1.hour
-    assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
-      assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 do
-        assert_select "tile", :count => 0
+    travel_to Time.utc(2010, 4, 3, 10, 55, 0) do
+      get :changes
+      assert_response :success
+      now = Time.now.getutc
+      hourago = now - 1.hour
+      assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
+        assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 do
+          assert_select "tile", :count => 0
+        end
       end
     end
-    Timecop.return
 
-    Timecop.freeze(Time.utc(2007, 1, 1, 0, 30, 0))
-    get :changes
-    assert_response :success
-    # print @response.body
-    # As we have loaded the fixtures, we can assume that there are some
-    # changes at the time we have frozen at
-    now = Time.now.getutc
-    hourago = now - 1.hour
-    assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
-      assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 do
-        assert_select "tile", :count => 6
+    travel_to Time.utc(2007, 1, 1, 0, 30, 0) do
+      get :changes
+      assert_response :success
+      # print @response.body
+      # As we have loaded the fixtures, we can assume that there are some
+      # changes at the time we have frozen at
+      now = Time.now.getutc
+      hourago = now - 1.hour
+      assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
+        assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 do
+          assert_select "tile", :count => 6
+        end
       end
     end
-    Timecop.return
   end
 
   def test_changes_zoom_invalid