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

diff --git a/3rdparty/modules/stdlib/spec/acceptance/member_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/member_spec.rb
old mode 100755
new mode 100644
index fe75a0782..ebadeb454
--- a/3rdparty/modules/stdlib/spec/acceptance/member_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/member_spec.rb
@@ -1,17 +1,15 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'member function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+describe 'member function' do
   shared_examples 'item found' do
-    it 'should output correctly' do
+    it 'outputs correctly' do
       apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
+        expect(r.stdout).to match(%r{Notice: output correct})
       end
     end
   end
   describe 'success' do
-    it 'members arrays' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $a = ['aaa','bbb','ccc']
       $b = 'ccc'
       $c = true
@@ -19,30 +17,35 @@ describe 'member function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('oper
       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 'members arrays' do
+      apply_manifest(pp1, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: output correct})
       end
     end
+
     describe 'members array of integers' do
-      it_should_behave_like 'item found' do
-        let(:pp) { <<-EOS
-      if member( [1,2,3,4], 4 ){
-        notify { 'output correct': }
-      }
-        EOS
-        }
+      let(:pp) do
+        <<-DOC
+            if member( [1,2,3,4], 4 ){
+              notify { 'output correct': }
+            }
+        DOC
+      end
+
+      it_behaves_like 'item found' do
       end
     end
     describe 'members of mixed array' do
-      it_should_behave_like 'item found' do
-        let(:pp) { <<-EOS
-      if member( ['a','4',3], 'a' ){
-        notify { 'output correct': }
-}
-        EOS
-        }
+      let(:pp) do
+        <<-DOC
+            if member( ['a','4',3], 'a' ){
+              notify { 'output correct': }
+            }
+        DOC
+      end
+
+      it_behaves_like 'item found' do
       end
     end
     it 'members arrays without members'