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

diff --git a/3rdparty/modules/stdlib/spec/acceptance/merge_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/merge_spec.rb
old mode 100755
new mode 100644
index 227b99429..17e2b9e01
--- a/3rdparty/modules/stdlib/spec/acceptance/merge_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/merge_spec.rb
@@ -1,22 +1,21 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'merge function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+describe 'merge function' do
   describe 'success' do
-    it 'should merge two hashes' do
-      pp = <<-EOS
+    pp = <<-DOC
       $a = {'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }
       $b = {'two' => 'dos', 'three' => { 'five' => 5 } }
       $o = merge($a, $b)
       notice(inline_template('merge[one]   is <%= @o["one"].inspect %>'))
       notice(inline_template('merge[two]   is <%= @o["two"].inspect %>'))
       notice(inline_template('merge[three] is <%= @o["three"].inspect %>'))
-      EOS
-
+    DOC
+    regex_array = [%r{merge\[one\]   is ("1"|1)}, %r{merge\[two\]   is "dos"}, %r{merge\[three\] is {"five"=>("5"|5)}}]
+    it 'merges two hashes' do
       apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/merge\[one\]   is ("1"|1)/)
-        expect(r.stdout).to match(/merge\[two\]   is "dos"/)
-        expect(r.stdout).to match(/merge\[three\] is {"five"=>("5"|5)}/)
+        regex_array.each do |i|
+          expect(r.stdout).to match(i)
+        end
       end
     end
   end