X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fdeep_merge_spec.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fdeep_merge_spec.rb;h=0000000000000000000000000000000000000000;hb=30caaa85aed7015ca0d77216bff175eebd917eb7;hp=29a2c7960f8af7399ee2aedf059c8457b1c9b9a5;hpb=6f656bd4265e3dab13b9af2bf96e9044322e9d8f;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
deleted file mode 100644
index 29a2c7960..000000000
--- a/3rdparty/modules/stdlib/spec/acceptance/deep_merge_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'deep_merge function' do
-  describe 'success' do
-    pp = <<-DOC
-      $hash1 = {'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }
-      $hash2 = {'two' => 'dos', 'three' => { 'five' => 5 } }
-      $merged_hash = deep_merge($hash1, $hash2)
-
-      if $merged_hash != { 'one' => 1, 'two' => 'dos', 'three' => { 'four' => 4, 'five' => 5 } } {
-        fail("Hash was incorrectly merged.")
-      }
-    DOC
-    it 'deeps merge two hashes' do
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-end