From 19db7fd1fefc4e4249d4e55f409f321fdb85aed1 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 16 Nov 2022 21:08:11 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/serializers/entity_date_helper_spec.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'spec/serializers') diff --git a/spec/serializers/entity_date_helper_spec.rb b/spec/serializers/entity_date_helper_spec.rb index a8c338675e2..5a4571339b3 100644 --- a/spec/serializers/entity_date_helper_spec.rb +++ b/spec/serializers/entity_date_helper_spec.rb @@ -48,7 +48,7 @@ RSpec.describe EntityDateHelper do describe '#remaining_days_in_words' do around do |example| - Timecop.freeze(Time.utc(2017, 3, 17)) { example.run } + travel_to(Time.utc(2017, 3, 17)) { example.run } end context 'when less than 31 days remaining' do @@ -75,7 +75,9 @@ RSpec.describe EntityDateHelper do end it 'returns 1 day remaining when queried mid-day' do - Timecop.freeze(Time.utc(2017, 3, 17, 13, 10)) do + travel_back + + travel_to(Time.utc(2017, 3, 17, 13, 10)) do expect(milestone_remaining).to eq("1 day remaining") end end -- cgit v1.2.3