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

diff --git a/3rdparty/modules/stdlib/spec/acceptance/values_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/values_spec.rb
old mode 100755
new mode 100644
index a2eff329d..b450dc7ba
--- a/3rdparty/modules/stdlib/spec/acceptance/values_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/values_spec.rb
@@ -1,10 +1,8 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'values function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+describe 'values function', :if => Puppet::Util::Package.versioncmp(Puppet.version, '5.5.0') < 0 do
   describe 'success' do
-    it 'returns an array of values' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $arg = {
         'a' => 1,
         'b' => 2,
@@ -12,24 +10,20 @@ describe 'values function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('oper
       }
       $output = values($arg)
       notice(inline_template('<%= @output.sort.inspect %>'))
-      EOS
-      if is_future_parser_enabled?
-        expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[1, 2, 3\]/)
-      else
-        expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\["1", "2", "3"\]/)
-      end
-
+    DOC
+    it 'returns an array of values' do
+      expect(apply_manifest(pp1, :catch_failures => true).stdout).to match(%r{\[1, 2, 3\]})
     end
   end
+
   describe 'failure' do
-    it 'handles non-hash arguments' do
-      pp = <<-EOS
+    pp2 = <<-DOC
       $arg = "foo"
       $output = values($arg)
       notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Requires hash/)
+    DOC
+    it 'handles non-hash arguments' do
+      expect(apply_manifest(pp2, :expect_failures => true).stderr).to match(%r{Requires hash})
     end
   end
 end