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=3c25ce28f8e03572ea6f6c0442bc68a71671f9f1;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;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 3c25ce28f..24dfa2fda
--- a/3rdparty/modules/stdlib/spec/functions/abs_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/abs_spec.rb
@@ -1,25 +1,14 @@
-#! /usr/bin/env ruby -S rspec
-
 require 'spec_helper'
-
-describe "the abs function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    expect(Puppet::Parser::Functions.function("abs")).to eq("function_abs")
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    expect { scope.function_abs([]) }.to( raise_error(Puppet::ParseError))
-  end
-
-  it "should convert a negative number into a positive" do
-    result = scope.function_abs(["-34"])
-    expect(result).to(eq(34))
-  end
-
-  it "should do nothing with a positive number" do
-    result = scope.function_abs(["5678"])
-    expect(result).to(eq(5678))
+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
 end