Skip to content

Commit 2a75849

Browse files
authored
Merge pull request #2548 from AriaXLi/FACT-3155/remove_timecop_from_spec_tests
(FACT-3155) Remove timecop from spec tests
2 parents 7eb6e26 + 9d493e9 commit 2a75849

File tree

4 files changed

+2
-6
lines changed

4 files changed

+2
-6
lines changed

facter.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ Gem::Specification.new do |spec|
3636
spec.add_development_dependency 'rubocop-rspec', '~> 1.38'
3737
spec.add_development_dependency 'simplecov', '~> 0.17.1'
3838
spec.add_development_dependency 'sys-filesystem', '~> 1.3'
39-
spec.add_development_dependency 'timecop', '~> 0.9'
4039
spec.add_development_dependency 'webmock', '~> 3.12'
4140
spec.add_development_dependency 'yard', '~> 0.9'
4241

spec/custom_facts/util/parser_spec.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,9 +354,6 @@ def expects_to_parse_powershell(cmd, result)
354354
let(:yaml_content) { load_fixture('external_fact_yaml_date').read }
355355

356356
it 'loads date' do
357-
if RUBY_VERSION.to_f == 3.2 && Gem::Version.new(Timecop::VERSION) < Gem::Version.new('0.9.6')
358-
pending 'There is a bug in newer versions of Psych and timecop'
359-
end
360357
expected_result = { 'testsfact' => { 'date' => Date.parse('2020-04-28') } }
361358

362359
expect(yaml_parser.parse_results).to eq(expected_result)

spec/facter/util/resolvers/aws_token_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
it 'makes a second request if token is expired' do
2929
allow(Facter::Util::Resolvers::Http).to receive(:put_request).and_return('token')
3030
aws_token.get(1)
31-
Timecop.travel(Time.now + 2)
31+
now = Time.now
32+
allow(Time).to receive(:now).and_return(now + 2)
3233
aws_token.get(1)
3334
expect(Facter::Util::Resolvers::Http).to have_received(:put_request).twice
3435
end

spec/spec_helper.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
require 'open3'
2020
require 'thor'
2121
require 'fileutils'
22-
require 'timecop'
2322

2423
require_relative '../lib/facter/resolvers/base_resolver'
2524

0 commit comments

Comments
 (0)