X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fpick_default_spec.rb;h=82b7ea5d35a9a57e35df9f7405aa0b5251e2c647;hb=6f656bd4265e3dab13b9af2bf96e9044322e9d8f;hp=a663f54e8ac600cebaf7e301f084c118a09ff5bd;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/acceptance/pick_default_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/pick_default_spec.rb
old mode 100755
new mode 100644
index a663f54e8..82b7ea5d3
--- a/3rdparty/modules/stdlib/spec/acceptance/pick_default_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/pick_default_spec.rb
@@ -1,53 +1,50 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'pick_default function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+describe 'pick_default function' do
   describe 'success' do
-    it 'pick_defaults a default value' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $a = undef
       $o = pick_default($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 'pick_defaults a default value' do
+      apply_manifest(pp1, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{picked is "default"})
       end
     end
-    it 'pick_defaults with no value' do
-      pp = <<-EOS
+
+    pp2 = <<-DOC
       $a = undef
       $b = undef
       $o = pick_default($a,$b)
       notice(inline_template('picked is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/picked is ""/)
+    DOC
+    it 'pick_defaults with no value' do
+      apply_manifest(pp2, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{picked is ""})
       end
     end
-    it 'pick_defaults the first set value' do
-      pp = <<-EOS
+
+    pp3 = <<-DOC
       $a = "something"
       $b = "long"
       $o = pick_default($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 'pick_defaults the first set value' do
+      apply_manifest(pp3, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{picked is "something"})
       end
     end
   end
   describe 'failure' do
-    it 'raises error with no values' do
-      pp = <<-EOS
+    pp4 = <<-DOC
       $o = pick_default()
       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 argument/)
+    DOC
+    it 'raises error with no values' do
+      apply_manifest(pp4, :expect_failures => true) do |r|
+        expect(r.stderr).to match(%r{Must receive at least one argument})
       end
     end
   end