Skip to content

Commit

Permalink
Replace timecop with the rails builtin travel_to method
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Jul 10, 2017
1 parent 3ab39f4 commit 28bfaa9
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 25 deletions.
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 1 addition & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
42 changes: 21 additions & 21 deletions test/controllers/api_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -304,32 +304,32 @@ def test_changes_simple
# 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
Expand Down

0 comments on commit 28bfaa9

Please sign in to comment.