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

diff --git a/3rdparty/modules/stdlib/spec/acceptance/validate_hash_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/validate_hash_spec.rb
old mode 100755
new mode 100644
index 52fb615bd..c349020a1
--- a/3rdparty/modules/stdlib/spec/acceptance/validate_hash_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/validate_hash_spec.rb
@@ -1,33 +1,32 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'validate_hash function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+describe 'validate_hash function' do
   describe 'success' do
-    it 'validates a single argument' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $one = { 'a' => 1 }
       validate_hash($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 = { 'a' => 1 }
       $two = { 'b' => 2 }
       validate_hash($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 a non-hash' do
-      {
-        %{validate_hash('{ "not" => "hash" }')} => "String",
-        %{validate_hash('string')}              => "String",
-        %{validate_hash(["array"])}             => "Array",
-        %{validate_hash(undef)}                 => "String",
-      }.each do |pp,type|
-        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/a #{type}/)
+
+    [
+      %{validate_hash('{ "not" => "hash" }')},
+      %{validate_hash('string')},
+      %{validate_hash(["array"])},
+      %{validate_hash(undef)},
+    ].each do |pp3|
+      it "rejects #{pp3.inspect}" do
+        expect(apply_manifest(pp3, :expect_failures => true).stderr).to match(%r{})
       end
     end
   end