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

diff --git a/3rdparty/modules/stdlib/spec/acceptance/try_get_value_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/try_get_value_spec.rb
old mode 100755
new mode 100644
index 716241c04..111281317
--- a/3rdparty/modules/stdlib/spec/acceptance/try_get_value_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/try_get_value_spec.rb
@@ -1,46 +1,43 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
 describe 'try_get_value function' do
   describe 'success' do
-    it 'gets a value' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $data = {
         'a' => { 'b' => 'passing'}
       }
 
       $tests = try_get_value($data, 'a/b')
       notice(inline_template('tests are <%= @tests.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/tests are "passing"/)
+    DOC
+    it 'gets a value' do
+      apply_manifest(pp1, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{tests are "passing"})
       end
     end
   end
+
   describe 'failure' do
-    it 'uses a default value' do
-      pp = <<-EOS
+    pp2 = <<-DOC
       $data = {
         'a' => { 'b' => 'passing'}
       }
 
       $tests = try_get_value($data, 'c/d', 'using the default value')
       notice(inline_template('tests are <%= @tests.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/using the default value/)
+    DOC
+    it 'uses a default value' do
+      apply_manifest(pp2, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{using the default value})
       end
     end
 
-    it 'raises error on incorrect number of arguments' do
-      pp = <<-EOS
+    pp = <<-DOC
       $o = try_get_value()
-      EOS
-
+    DOC
+    it 'raises error on incorrect number of arguments' do
       apply_manifest(pp, :expect_failures => true) do |r|
-        expect(r.stderr).to match(/wrong number of arguments/i)
+        expect(r.stderr).to match(%r{wrong number of arguments}i)
       end
     end
   end