Replace Timecop with new ActiveSupport helpers

test/models/recurring_todos/abstract_repeat_pattern_test.rb

@@ -101,7 +101,7 @@ module RecurringTodos
     end
 
     def test_determine_start
-      Timecop.travel(2013,1,1) do
+      travel_to Time.zone.local(2013,1,1) do
         rt = create_recurring_todo
         assert_equal "2013-01-01 00:00:00", rt.send(:determine_start, nil).to_s(:db), "no previous date, use today"
         assert_equal "2013-01-01 00:00:00", rt.send(:determine_start, nil, 1.day).to_s(:db), "no previous date, use today without offset"

test/models/staleness_test.rb

@@ -1,9 +1,10 @@
 require_relative '../minimal_test_helper'
 require_relative '../../lib/staleness'
 require_relative '../../lib/user_time'
-require 'timecop'
 
 class StalenessTest < Minitest::Test
+  include ActiveSupport::Testing::TimeHelpers
+
   FakePrefs = Struct.new(:time_zone)
   FakeUser = Struct.new(:time) do
     def prefs
@@ -36,11 +37,11 @@ class StalenessTest < Minitest::Test
 
   def setup
     @current_user = FakeUser.new(now)
-    Timecop.freeze(Time.utc(2013,02,28))
+    travel_to Time.utc(2013,02,28)
   end
 
   def teardown
-    Timecop.return
+    travel_back
   end
 
   def test_item_with_due_date_is_not_stale_ever

test/models/todo_test.rb

@@ -169,7 +169,7 @@ class TodoTest < ActiveSupport::TestCase
     dates.each do |show_from_date|
       # setup test case
       t = @not_completed1
-      Timecop.travel(show_from_date - 1.day) do
+      travel_to show_from_date - 1.day do
         t.show_from = show_from_date
         t.save!
         assert t.deferred?

test/models/todos/calendar_test.rb

@@ -34,7 +34,7 @@ module Todos
 
     def test_due_this_month_at_start_month
       # should return 1 todo
-      Timecop.travel(2013,9,1) do
+      travel_to Time.zone.local(2013,9,1) do
         due_this_month = create_todo(Time.zone.now.end_of_month)
         assert_equal [due_this_month], @calendar.due_this_month
       end
@@ -43,7 +43,7 @@ module Todos
     def test_due_this_month_at_end_month
       # the todo is due next week and is thus left out for todos due rest 
       # of month (i.e. after next week, but in this month)
-      Timecop.travel(2013,9,23) do
+      travel_to Time.zone.local(2013,9,23) do
         due_this_month = create_todo(Time.zone.now.end_of_month)
         assert_equal 0, @calendar.due_this_month.size
       end

test/models/todos/done_todos_test.rb

@@ -4,7 +4,7 @@ module Todos
   class DoneTodosTest < ActiveSupport::TestCase
 
     def test_completed_period
-      Timecop.travel(2013,1,23,12,00,00) do  # wednesday at 12:00; 
+      travel_to Time.zone.local(2013,1,23,12,00,00) do  # wednesday at 12:00;
         assert_equal "today",         DoneTodos.completed_period(Time.zone.local(2013,1,23,9,00))   # today at 9:00
         assert_equal "rest_of_week",  DoneTodos.completed_period(Time.zone.local(2013,1,21))        # monday this week
         assert_equal "rest_of_month", DoneTodos.completed_period(Time.zone.local(2013,1,8))         # tuestday in first week of jan 
@@ -30,13 +30,13 @@ module Todos
       todos = users(:admin_user).todos
 
       # When I mark a todo complete on jan 1
-      Timecop.travel(2013,1,1,0,0) do
+      travel_to Time.zone.local(2013,1,1,0,0) do
         t = users(:admin_user).todos.active.first
         t.complete!
       end
 
       # Then I should be in rest_of_week on jan 2
-      Timecop.travel(2013,1,2,0,0) do
+      travel_to Time.zone.local(2013,1,2,0,0) do
         assert 0, DoneTodos.done_today(todos.reload, {}).count
         assert 1, DoneTodos.done_rest_of_week(todos.reload, {}).count
       end
@@ -46,13 +46,13 @@ module Todos
       todos = users(:admin_user).todos
 
       # When I mark a todo complete on jan 1
-      Timecop.travel(2013,1,1,0,0) do
+      travel_to Time.zone.local(2013,1,1,0,0) do
         t = users(:admin_user).todos.active.first
         t.complete!
       end
 
       # Then I should be in rest_of_month on jan 21
-      Timecop.travel(2013,1,21,0,0) do
+      travel_to Time.zone.local(2013,1,21,0,0) do
         assert 0, DoneTodos.done_today(todos.reload, {}).count
         assert 0, DoneTodos.done_rest_of_week(todos.reload, {}).count
         assert 1, DoneTodos.done_rest_of_month(todos.reload, {}).count

test/models/user_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
-require 'timecop'
 
 class UserTest < ActiveSupport::TestCase
   fixtures :users, :preferences, :projects, :contexts, :todos, :recurring_todos
@@ -351,7 +350,7 @@ class UserTest < ActiveSupport::TestCase
     assert_nil u.remember_token_expires_at
 
     # set token on 2013-feb-28
-    Timecop.travel(Time.local(2013, 2, 28)) do
+    travel_to Time.local(2013, 2, 28) do
       u.remember_me
       assert_not_nil u.remember_token_expires_at
 
@@ -359,12 +358,12 @@ class UserTest < ActiveSupport::TestCase
     end
 
     # token should be valid after 5 days
-    Timecop.travel(Time.local(2013, 3, 5)) do
+    travel_to Time.local(2013, 3, 5) do
       assert u.remember_token?
     end
 
     # token should not be valid after more than 2 weeks
-    Timecop.travel(Time.local(2013, 3, 28)) do
+    travel_to Time.local(2013, 3, 28) do
       assert !u.remember_token?
     end
   end