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

diff --git a/3rdparty/modules/stdlib/spec/acceptance/flatten_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/flatten_spec.rb
old mode 100755
new mode 100644
index 289eec95e..79d4854d8
--- a/3rdparty/modules/stdlib/spec/acceptance/flatten_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/flatten_spec.rb
@@ -1,34 +1,32 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'flatten function' do
+describe 'flatten function', :if => Puppet::Util::Package.versioncmp(Puppet.version, '5.5.0') < 0 do
   describe 'success' do
-    it 'flattens arrays' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $a = ["a","b",["c",["d","e"],"f","g"]]
       $b = ["a","b","c","d","e","f","g"]
       $o = flatten($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 'flattens arrays' do
+      apply_manifest(pp1, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: output correct})
       end
     end
-    it 'does not affect flat arrays' do
-      pp = <<-EOS
+
+    pp2 = <<-DOC
       $a = ["a","b","c","d","e","f","g"]
       $b = ["a","b","c","d","e","f","g"]
       $o = flatten($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 'does not affect flat arrays' do
+      apply_manifest(pp2, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: output correct})
       end
     end
   end