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

diff --git a/3rdparty/modules/stdlib/spec/acceptance/min_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/min_spec.rb
old mode 100755
new mode 100644
index 509092d3c..ea9606032
--- a/3rdparty/modules/stdlib/spec/acceptance/min_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/min_spec.rb
@@ -1,16 +1,14 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'min function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+describe 'min function', :if => Puppet::Util::Package.versioncmp(return_puppet_version, '6.0.0') < 0 do
   describe 'success' do
-    it 'mins arrays' do
-      pp = <<-EOS
+    pp = <<-DOC
       $o = min("the","public","art","galleries")
       notice(inline_template('min is <%= @o.inspect %>'))
-      EOS
-
+    DOC
+    it 'mins arrays' do
       apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/min is "art"/)
+        expect(r.stdout).to match(%r{min is "art"})
       end
     end
   end