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

diff --git a/3rdparty/modules/stdlib/spec/acceptance/deep_merge_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/deep_merge_spec.rb
old mode 100755
new mode 100644
index c0f9b126d..29a2c7960
--- a/3rdparty/modules/stdlib/spec/acceptance/deep_merge_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/deep_merge_spec.rb
@@ -1,10 +1,8 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'deep_merge function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+describe 'deep_merge function' do
   describe 'success' do
-    it 'should deep merge two hashes' do
-      pp = <<-EOS
+    pp = <<-DOC
       $hash1 = {'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }
       $hash2 = {'two' => 'dos', 'three' => { 'five' => 5 } }
       $merged_hash = deep_merge($hash1, $hash2)
@@ -12,8 +10,8 @@ describe 'deep_merge function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('
       if $merged_hash != { 'one' => 1, 'two' => 'dos', 'three' => { 'four' => 4, 'five' => 5 } } {
         fail("Hash was incorrectly merged.")
       }
-      EOS
-
+    DOC
+    it 'deeps merge two hashes' do
       apply_manifest(pp, :catch_failures => true)
     end
   end