From de0afe1621ca5bf864930b3d05b17e1d800dc95d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Mart=C3=ADn?= Date: Mon, 2 Jul 2018 18:26:54 +0200 Subject: [PATCH] Don't monkey patch ActiveSupport. It could have side effects (for example, a conflict after upgrading to Rails 5). Thanks @aitbw for the suggestion! --- spec/features/officing/results_spec.rb | 3 +-- spec/spec_helper.rb | 1 + spec/time_helper.rb | 8 -------- 3 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 spec/time_helper.rb diff --git a/spec/features/officing/results_spec.rb b/spec/features/officing/results_spec.rb index b0b4d66be..821e4b001 100644 --- a/spec/features/officing/results_spec.rb +++ b/spec/features/officing/results_spec.rb @@ -1,10 +1,9 @@ require 'rails_helper' -require 'time_helper' feature 'Officing Results' do background do - freeze_time + travel_to Time.now # TODO: use `freeze_time` after migrating to Rails 5. @poll_officer = create(:poll_officer) @officer_assignment = create(:poll_officer_assignment, :final, officer: @poll_officer) @poll = @officer_assignment.booth_assignment.poll diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 2598f085e..1f4c703b7 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -18,6 +18,7 @@ RSpec.configure do |config| config.include(EmailSpec::Helpers) config.include(EmailSpec::Matchers) config.include(CommonActions) + config.include(ActiveSupport::Testing::TimeHelpers) config.before(:suite) do DatabaseCleaner.clean_with :truncation end diff --git a/spec/time_helper.rb b/spec/time_helper.rb deleted file mode 100644 index 547f3772c..000000000 --- a/spec/time_helper.rb +++ /dev/null @@ -1,8 +0,0 @@ -module ActiveSupport::Testing::TimeHelpers - # Copied from Rails 5.2. TODO: remove after migrating to Rails 5. - def freeze_time(&block) - travel_to Time.now, &block - end -end - -include ActiveSupport::Testing::TimeHelpers