X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fpick_spec.rb;h=14834b426bfaf082bb5c8b5bf33402e665c2c47b;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=c70b2d91efa28a47f15f2c78dbdcb07865b006f5;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/acceptance/pick_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/pick_spec.rb
old mode 100755
new mode 100644
index c70b2d91e..14834b426
--- a/3rdparty/modules/stdlib/spec/acceptance/pick_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/pick_spec.rb
@@ -1,43 +1,41 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
 describe 'pick function' do
   describe 'success' do
-    it 'picks a default value' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $a = undef
       $o = pick($a, 'default')
       notice(inline_template('picked is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/picked is "default"/)
+    DOC
+    it 'picks a default value' do
+      apply_manifest(pp1, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{picked is "default"})
       end
     end
-    it 'picks the first set value' do
-      pp = <<-EOS
+
+    pp2 = <<-DOC
       $a = "something"
       $b = "long"
       $o = pick($a, $b, 'default')
       notice(inline_template('picked is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/picked is "something"/)
+    DOC
+    it 'picks the first set value' do
+      apply_manifest(pp2, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{picked is "something"})
       end
     end
   end
+
   describe 'failure' do
-    it 'raises error with all undef values' do
-      pp = <<-EOS
+    pp3 = <<-DOC
       $a = undef
       $b = undef
       $o = pick($a, $b)
       notice(inline_template('picked is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :expect_failures => true) do |r|
-        expect(r.stderr).to match(/must receive at least one non empty value/)
+    DOC
+    it 'raises error with all undef values' do
+      apply_manifest(pp3, :expect_failures => true) do |r|
+        expect(r.stderr).to match(%r{must receive at least one non empty value})
       end
     end
   end