X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fmerge_spec.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fmerge_spec.rb;h=0000000000000000000000000000000000000000;hb=30caaa85aed7015ca0d77216bff175eebd917eb7;hp=17e2b9e015452daee70b890af10b93f6664c2702;hpb=6f656bd4265e3dab13b9af2bf96e9044322e9d8f;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
deleted file mode 100644
index 17e2b9e01..000000000
--- a/3rdparty/modules/stdlib/spec/acceptance/merge_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'merge function' do
-  describe 'success' do
-    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 %>'))
-    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|
-        regex_array.each do |i|
-          expect(r.stdout).to match(i)
-        end
-      end
-    end
-  end
-end