X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fjoin_spec.rb;h=233b953a0be4f4f243f4ebc98e992645030603f0;hb=6f656bd4265e3dab13b9af2bf96e9044322e9d8f;hp=5397ce2c8c1f42bf4228be4e66651c06f0d589a3;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/acceptance/join_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/join_spec.rb
old mode 100755
new mode 100644
index 5397ce2c8..233b953a0
--- a/3rdparty/modules/stdlib/spec/acceptance/join_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/join_spec.rb
@@ -1,10 +1,8 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'join function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+describe 'join function', :if => Puppet::Util::Package.versioncmp(Puppet.version, '5.5.0') < 0 do
   describe 'success' do
-    it 'joins arrays' do
-      pp = <<-EOS
+    pp = <<-DOC
       $a = ['aaa','bbb','ccc']
       $b = ':'
       $c = 'aaa:bbb:ccc'
@@ -12,10 +10,10 @@ describe 'join function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operat
       if $o == $c {
         notify { 'output correct': }
       }
-      EOS
-
+    DOC
+    it 'joins arrays' do
       apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
+        expect(r.stdout).to match(%r{Notice: output correct})
       end
     end
     it 'handles non arrays'