Suggest different variables to use if we want to tunnel both v4 and v6

[mirror/dsa-puppet.git] / 3rdparty / modules / stdlib / spec / acceptance / join_spec.rb

diff --git a/3rdparty/modules/stdlib/spec/acceptance/join_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/join_spec.rb
old mode 100755 (executable)
new mode 100644 (file)
index 75b88d8..233b953
--- 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' 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' do
       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'