X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Floadyaml_spec.rb;h=f55274c58fbb24a4a44d11be8c963322926c917f;hb=6f656bd4265e3dab13b9af2bf96e9044322e9d8f;hp=57fb8cbbb70263c9b83767c6db53b257f29811c1;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/acceptance/loadyaml_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/loadyaml_spec.rb
index 57fb8cbbb..f55274c58 100644
--- a/3rdparty/modules/stdlib/spec/acceptance/loadyaml_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/loadyaml_spec.rb
@@ -1,52 +1,48 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
 tmpdir = default.tmpdir('stdlib')
 
 describe 'loadyaml function' do
   describe 'success' do
-    it 'loadyamls array of values' do
-      shell("echo '---
+    shell("echo '---
       aaa: 1
       bbb: 2
       ccc: 3
-      ddd: 4' > #{tmpdir}/testyaml.yaml")
-      pp = <<-EOS
-      $o = loadyaml('#{tmpdir}/testyaml.yaml')
+      ddd: 4' > #{tmpdir}/test1yaml.yaml")
+    pp1 = <<-DOC
+      $o = loadyaml('#{tmpdir}/test1yaml.yaml')
       notice(inline_template('loadyaml[aaa] is <%= @o["aaa"].inspect %>'))
       notice(inline_template('loadyaml[bbb] is <%= @o["bbb"].inspect %>'))
       notice(inline_template('loadyaml[ccc] is <%= @o["ccc"].inspect %>'))
       notice(inline_template('loadyaml[ddd] is <%= @o["ddd"].inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/loadyaml\[aaa\] is 1/)
-        expect(r.stdout).to match(/loadyaml\[bbb\] is 2/)
-        expect(r.stdout).to match(/loadyaml\[ccc\] is 3/)
-        expect(r.stdout).to match(/loadyaml\[ddd\] is 4/)
+    DOC
+    regex_array = [%r{loadyaml\[aaa\] is 1}, %r{loadyaml\[bbb\] is 2}, %r{loadyaml\[ccc\] is 3}, %r{loadyaml\[ddd\] is 4}]
+    it 'loadyamls array of values' do
+      apply_manifest(pp1, :catch_failures => true) do |r|
+        regex_array.each do |i|
+          expect(r.stdout).to match(i)
+        end
       end
     end
 
-    it 'returns the default value if there is no file to load' do
-      pp = <<-EOS
+    pp2 = <<-DOC
       $o = loadyaml('#{tmpdir}/no-file.yaml', {'default' => 'value'})
       notice(inline_template('loadyaml[default] is <%= @o["default"].inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/loadyaml\[default\] is "value"/)
+    DOC
+    it 'returns the default value if there is no file to load' do
+      apply_manifest(pp2, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{loadyaml\[default\] is "value"})
       end
     end
 
-    it 'returns the default value if the file was parsed with an error' do
-      shell("echo '!' > #{tmpdir}/testyaml.yaml")
-      pp = <<-EOS
-      $o = loadyaml('#{tmpdir}/testyaml.yaml', {'default' => 'value'})
+    shell("echo '!' > #{tmpdir}/test2yaml.yaml")
+    pp3 = <<-DOC
+      $o = loadyaml('#{tmpdir}/test2yaml.yaml', {'default' => 'value'})
       notice(inline_template('loadyaml[default] is <%= @o["default"].inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/loadyaml\[default\] is "value"/)
+    DOC
+    it 'returns the default value if the file was parsed with an error' do
+      apply_manifest(pp3, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{loadyaml\[default\] is "value"})
       end
     end
   end