X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fabs_spec.rb;h=24dfa2fdab63c2275697db0534bcf5050aa644d5;hb=30caaa85aed7015ca0d77216bff175eebd917eb7;hp=7d2257b02d7104d58c7c0d963cd00fdbede691be;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/abs_spec.rb b/3rdparty/modules/stdlib/spec/functions/abs_spec.rb
old mode 100755
new mode 100644
index 7d2257b02..24dfa2fda
--- a/3rdparty/modules/stdlib/spec/functions/abs_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/abs_spec.rb
@@ -1,30 +1,14 @@
 require 'spec_helper'
-
-describe 'abs' do
-  it { is_expected.not_to eq(nil) }
-
-  describe 'signature validation in puppet3', :unless => RSpec.configuration.puppet_future do
-    it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
-    it {
-      pending("Current implementation ignores parameters after the first.")
-      is_expected.to run.with_params(1, 2).and_raise_error(Puppet::ParseError, /wrong number of arguments/i)
-    }
+if Puppet::Util::Package.versioncmp(Puppet.version, '6.0.0') < 0
+  describe 'abs' do
+    it { is_expected.not_to eq(nil) }
+    it { is_expected.to run.with_params(-34).and_return(34) }
+    it { is_expected.to run.with_params('-34').and_return(34) }
+    it { is_expected.to run.with_params(34).and_return(34) }
+    it { is_expected.to run.with_params('34').and_return(34) }
+    it { is_expected.to run.with_params(-34.5).and_return(34.5) }
+    it { is_expected.to run.with_params('-34.5').and_return(34.5) }
+    it { is_expected.to run.with_params(34.5).and_return(34.5) }
+    it { is_expected.to run.with_params('34.5').and_return(34.5) }
   end
-
-  describe 'signature validation in puppet4', :if => RSpec.configuration.puppet_future do
-    it { pending "the puppet 4 implementation"; is_expected.to run.with_params().and_raise_error(ArgumentError) }
-    it { pending "the puppet 4 implementation"; is_expected.to run.with_params(1, 2).and_raise_error(ArgumentError) }
-    it { pending "the puppet 4 implementation"; is_expected.to run.with_params([]).and_raise_error(ArgumentError) }
-    it { pending "the puppet 4 implementation"; is_expected.to run.with_params({}).and_raise_error(ArgumentError) }
-    it { pending "the puppet 4 implementation"; is_expected.to run.with_params(true).and_raise_error(ArgumentError) }
-  end
-
-  it { is_expected.to run.with_params(-34).and_return(34) }
-  it { is_expected.to run.with_params("-34").and_return(34) }
-  it { is_expected.to run.with_params(34).and_return(34) }
-  it { is_expected.to run.with_params("34").and_return(34) }
-  it { is_expected.to run.with_params(-34.5).and_return(34.5) }
-  it { is_expected.to run.with_params("-34.5").and_return(34.5) }
-  it { is_expected.to run.with_params(34.5).and_return(34.5) }
-  it { is_expected.to run.with_params("34.5").and_return(34.5) }
 end