X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fabs_spec.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fabs_spec.rb;h=e3d904a0792403955a80e62216bcaf0a7495bb48;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=5af436f2a7aa7cf7a8893b6f294679df9d8fb9f2;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/acceptance/abs_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/abs_spec.rb
old mode 100755
new mode 100644
index 5af436f2a..e3d904a07
--- a/3rdparty/modules/stdlib/spec/acceptance/abs_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/abs_spec.rb
@@ -1,29 +1,26 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'abs function' do
+describe 'abs function', :if => Puppet::Util::Package.versioncmp(return_puppet_version, '6.0.0') < 0 do
   describe 'success' do
-    it 'should accept a string' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $input  = '-34.56'
       $output = abs($input)
       notify { "$output": }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: 34.56/)
+    DOC
+    it 'accepts a string' do
+      apply_manifest(pp1, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: 34.56})
       end
     end
 
-    it 'should accept a float' do
-      pp = <<-EOS
-      $input  = -34.56
+    pp2 = <<-DOC
+      $input  = -35.46
       $output = abs($input)
       notify { "$output": }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: 34.56/)
+    DOC
+    it 'accepts a float' do
+      apply_manifest(pp2, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: 35.46})
       end
     end
   end