X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fempty_spec.rb;h=c5c63c043878a0ec26fb393f76ad4e08ac902e7a;hb=6f656bd4265e3dab13b9af2bf96e9044322e9d8f;hp=97b73334855397b8dea4c53770a787a167611909;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/acceptance/empty_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/empty_spec.rb
old mode 100755
new mode 100644
index 97b733348..c5c63c043
--- a/3rdparty/modules/stdlib/spec/acceptance/empty_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/empty_spec.rb
@@ -1,48 +1,46 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'empty function' do
+describe 'empty function', :if => Puppet::Util::Package.versioncmp(Puppet.version, '5.5.0') < 0 do
   describe 'success' do
-    it 'recognizes empty strings' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $a = ''
       $b = true
       $o = empty($a)
       if $o == $b {
         notify { 'output correct': }
       }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
+    DOC
+    it 'recognizes empty strings' do
+      apply_manifest(pp1, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: output correct})
       end
     end
-    it 'recognizes non-empty strings' do
-      pp = <<-EOS
+
+    pp2 = <<-DOC
       $a = 'aoeu'
       $b = false
       $o = empty($a)
       if $o == $b {
         notify { 'output correct': }
       }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
+    DOC
+    it 'recognizes non-empty strings' do
+      apply_manifest(pp2, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: output correct})
       end
     end
-    it 'handles numerical values' do
-      pp = <<-EOS
+
+    pp3 = <<-DOC
       $a = 7
       $b = false
       $o = empty($a)
       if $o == $b {
         notify { 'output correct': }
       }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
+    DOC
+    it 'handles numerical values' do
+      apply_manifest(pp3, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: output correct})
       end
     end
   end