diff options
author | Hunter Haugen <hunter@puppetlabs.com> | 2015-06-04 09:40:52 -0700 |
---|---|---|
committer | Hunter Haugen <hunter@puppetlabs.com> | 2015-06-04 09:40:52 -0700 |
commit | ad4ca4cc3486b0eaaa813595907521ce35c970ce (patch) | |
tree | 9a1a69b4bcd18b0ac74eeb017ea47b7cbd942b7e /spec/functions | |
parent | f5f72f4b5a34e7a6c099f8fabdc55f79000b9a8b (diff) |
Fix time() on 1.8.7
The time() function takes an argument of a timezone, and always returns
time in epoch format. The epoch format is the number of seconds that
have elapsed since January 1, 1970 (midnight UTC/GMT), not counting leap
seconds. This means that it is universally the same regardless of
timezones.
I don't know what the timezone argument is supposed to do, and it is not
documented. So lets just make 1.8.7 work like > 1.8.7
Diffstat (limited to 'spec/functions')
-rwxr-xr-x | spec/functions/time_spec.rb | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/spec/functions/time_spec.rb b/spec/functions/time_spec.rb index 2875e25..d157939 100755 --- a/spec/functions/time_spec.rb +++ b/spec/functions/time_spec.rb @@ -7,7 +7,7 @@ describe 'time' do context 'when running at a specific time' do before(:each) { # get a value before stubbing the function - test_time = Time.utc(2006, 10, 13, 8, 15, 11, '+01:00') + test_time = Time.utc(2006, 10, 13, 8, 15, 11) Time.expects(:new).with().returns(test_time).once } it { is_expected.to run.with_params().and_return(1160727311) } @@ -16,13 +16,6 @@ describe 'time' do it { is_expected.to run.with_params({}).and_return(1160727311) } it { is_expected.to run.with_params('foo').and_return(1160727311) } it { is_expected.to run.with_params('UTC').and_return(1160727311) } - - context 'when running on modern rubies', :unless => RUBY_VERSION == '1.8.7' do - it { is_expected.to run.with_params('America/Los_Angeles').and_return(1160727311) } - end - - context 'when running on ruby 1.8.7, which garbles the TZ', :if => RUBY_VERSION == '1.8.7' do - it { is_expected.to run.with_params('America/Los_Angeles').and_return(1160702111) } - end + it { is_expected.to run.with_params('America/New_York').and_return(1160727311) } end end |