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

diff --git a/3rdparty/modules/stdlib/spec/acceptance/validate_string_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/validate_string_spec.rb
old mode 100755
new mode 100644
index f04608de9..d141f59f3
--- a/3rdparty/modules/stdlib/spec/acceptance/validate_string_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/validate_string_spec.rb
@@ -1,39 +1,38 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
 describe 'validate_string function' do
   describe 'success' do
-    it 'validates a single argument' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $one = 'string'
       validate_string($one)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
+    DOC
+    it 'validates a single argument' do
+      apply_manifest(pp1, :catch_failures => true)
     end
-    it 'validates an multiple arguments' do
-      pp = <<-EOS
+
+    pp2 = <<-DOC
       $one = 'string'
       $two = 'also string'
       validate_string($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
+    DOC
+    it 'validates an multiple arguments' do
+      apply_manifest(pp2, :catch_failures => true)
     end
-    it 'validates undef' do
-      pp = <<-EOS
-      validate_string(undef)
-      EOS
 
-      apply_manifest(pp, :catch_failures => true)
+    pp3 = <<-DOC
+      validate_string(undef)
+    DOC
+    it 'validates undef' do
+      apply_manifest(pp3, :catch_failures => true)
     end
-    it 'validates a non-string' do
-      {
-        %{validate_string({ 'a' => 'hash' })} => "Hash",
-        %{validate_string(['array'])}         => "Array",
-        %{validate_string(false)}             => "FalseClass",
-      }.each do |pp,type|
-        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/a #{type}/)
+
+    {
+      %{validate_string({ 'a' => 'hash' })} => 'Hash',
+      %{validate_string(['array'])}         => 'Array',
+      %{validate_string(false)}             => 'FalseClass',
+    }.each do |pp4, type|
+      it "validates a non-string: #{pp4.inspect}" do
+        expect(apply_manifest(pp4, :expect_failures => true).stderr).to match(%r{a #{type}})
       end
     end
   end