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

diff --git a/3rdparty/modules/stdlib/spec/acceptance/has_key_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/has_key_spec.rb
old mode 100755
new mode 100644
index c8557cbeb..9da69c29d
--- a/3rdparty/modules/stdlib/spec/acceptance/has_key_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/has_key_spec.rb
@@ -1,10 +1,8 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'has_key function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+describe 'has_key function' do
   describe 'success' do
-    it 'has_keys in hashes' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $a = { 'aaa' => 'bbb','bbb' => 'ccc','ddd' => 'eee' }
       $b = 'bbb'
       $c = true
@@ -12,14 +10,14 @@ describe 'has_key function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('ope
       if $o == $c {
         notify { 'output correct': }
       }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
+    DOC
+    it 'has_keys in hashes' do
+      apply_manifest(pp1, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: output correct})
       end
     end
-    it 'has_keys not in hashes' do
-      pp = <<-EOS
+
+    pp2 = <<-DOC
       $a = { 'aaa' => 'bbb','bbb' => 'ccc','ddd' => 'eee' }
       $b = 'ccc'
       $c = false
@@ -27,10 +25,10 @@ describe 'has_key function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('ope
       if $o == $c {
         notify { 'output correct': }
       }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
+    DOC
+    it 'has_keys not in hashes' do
+      apply_manifest(pp2, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: output correct})
       end
     end
   end