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

diff --git a/3rdparty/modules/stdlib/spec/acceptance/dirname_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/dirname_spec.rb
old mode 100755
new mode 100644
index db83f0f7d..a532e11ce
--- a/3rdparty/modules/stdlib/spec/acceptance/dirname_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/dirname_spec.rb
@@ -1,37 +1,34 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
 describe 'dirname function' do
   describe 'success' do
-    context 'absolute path' do
-      it 'returns the dirname' do
-        pp = <<-EOS
+    context 'with absolute path' do
+      pp1 = <<-DOC
         $a = '/path/to/a/file.txt'
         $b = '/path/to/a'
         $o = dirname($a)
         if $o == $b {
           notify { 'output correct': }
         }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true) do |r|
-          expect(r.stdout).to match(/Notice: output correct/)
+      DOC
+      it 'returns the dirname' do
+        apply_manifest(pp1, :catch_failures => true) do |r|
+          expect(r.stdout).to match(%r{Notice: output correct})
         end
       end
     end
-    context 'relative path' do
-      it 'returns the dirname' do
-        pp = <<-EOS
+    context 'with relative path' do
+      pp2 = <<-DOC
         $a = 'path/to/a/file.txt'
         $b = 'path/to/a'
         $o = dirname($a)
         if $o == $b {
           notify { 'output correct': }
         }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true) do |r|
-          expect(r.stdout).to match(/Notice: output correct/)
+      DOC
+      it 'returns the dirname' do
+        apply_manifest(pp2, :catch_failures => true) do |r|
+          expect(r.stdout).to match(%r{Notice: output correct})
         end
       end
     end