X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fstrftime_spec.rb;h=73c5c968b0f3d90cf29d136fb8c196f9dd82213c;hb=d53c789b368b6d3dbc41671fd7a1f16050172627;hp=41cda6a209cc7289c2e342932be38df5e3137ce1;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/strftime_spec.rb b/3rdparty/modules/stdlib/spec/functions/strftime_spec.rb
old mode 100755
new mode 100644
index 41cda6a20..73c5c968b
--- a/3rdparty/modules/stdlib/spec/functions/strftime_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/strftime_spec.rb
@@ -1,26 +1,26 @@
 require 'spec_helper'
 
-describe 'strftime' do
-  it "should exist" do
-    expect(Puppet::Parser::Functions.function("strftime")).to eq("function_strftime")
+describe 'strftime', :if => Puppet::Util::Package.versioncmp(Puppet.version, '4.8.0') < 0 do
+  it 'exists' do
+    expect(Puppet::Parser::Functions.function('strftime')).to eq('function_strftime')
   end
 
-  it "should raise a ParseError if there is less than 1 arguments" do
-    expect { scope.function_strftime([]) }.to( raise_error(Puppet::ParseError))
+  it 'raises a ParseError if there is less than 1 arguments' do
+    expect { scope.function_strftime([]) }.to(raise_error(Puppet::ParseError))
   end
 
-  it "using %s should be higher then when I wrote this test" do
-    result = scope.function_strftime(["%s"])
-    expect(result.to_i).to(be > 1311953157)
+  it 'using %s should be higher then when I wrote this test' do
+    result = scope.function_strftime(['%s'])
+    expect(result.to_i).to(be > 1_311_953_157)
   end
 
-  it "using %s should be greater than 1.5 trillion" do
-    result = scope.function_strftime(["%s"])
-    expect(result.to_i).to(be > 1500000000)
+  it 'using %s should be greater than 1.5 trillion' do
+    result = scope.function_strftime(['%s'])
+    expect(result.to_i).to(be > 1_500_000_000)
   end
 
-  it "should return a date when given %Y-%m-%d" do
-    result = scope.function_strftime(["%Y-%m-%d"])
-    expect(result).to match(/^\d{4}-\d{2}-\d{2}$/)
+  it 'returns a date when given %Y-%m-%d' do
+    result = scope.function_strftime(['%Y-%m-%d'])
+    expect(result).to match(%r{^\d{4}-\d{2}-\d{2}$})
   end
 end