X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fsort_spec.rb;h=8c4a3ab0de26d8e46dcedc5f07221c3c0acfa236;hb=d53c789b368b6d3dbc41671fd7a1f16050172627;hp=c85bfabd5c35f1f2b48d2b16c92ceaf9118d9b82;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/acceptance/sort_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/sort_spec.rb
old mode 100755
new mode 100644
index c85bfabd5..8c4a3ab0d
--- a/3rdparty/modules/stdlib/spec/acceptance/sort_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/sort_spec.rb
@@ -1,29 +1,27 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'sort function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+describe 'sort function', :if => Puppet::Util::Package.versioncmp(return_puppet_version, '6.0.0') < 0 do
   describe 'success' do
-    it 'sorts arrays' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $a = ["the","public","art","galleries"]
       # Anagram: Large picture halls, I bet
       $o = sort($a)
       notice(inline_template('sort is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/sort is \["art", "galleries", "public", "the"\]/)
+    DOC
+    it 'sorts arrays' do
+      apply_manifest(pp1, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{sort is \["art", "galleries", "public", "the"\]})
       end
     end
-    it 'sorts strings' do
-      pp = <<-EOS
+
+    pp2 = <<-DOC
       $a = "blowzy night-frumps vex'd jack q"
       $o = sort($a)
       notice(inline_template('sort is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/sort is "    '-abcdefghijklmnopqrstuvwxyz"/)
+    DOC
+    it 'sorts strings' do
+      apply_manifest(pp2, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{sort is "    '-abcdefghijklmnopqrstuvwxyz"})
       end
     end
   end