X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fhas_ip_network_spec.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fhas_ip_network_spec.rb;h=e18f0506d3b567b59ee000bb95396a3a24b48a3e;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=f7a7d3533280fdeac0ff01072ccb67f419762ba5;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/acceptance/has_ip_network_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/has_ip_network_spec.rb
old mode 100755
new mode 100644
index f7a7d3533..e18f0506d
--- a/3rdparty/modules/stdlib/spec/acceptance/has_ip_network_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/has_ip_network_spec.rb
@@ -1,28 +1,26 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'has_ip_network function', :unless => ((fact('osfamily') == 'windows') or (fact('osfamily') == 'AIX')) do
+describe 'has_ip_network function', :unless => ((fact('osfamily') == 'windows') || (fact('osfamily') == 'AIX')) do
   describe 'success' do
-    it 'has_ip_network existing ipaddress' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $a = '127.0.0.0'
       $o = has_ip_network($a)
       notice(inline_template('has_ip_network is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/has_ip_network is true/)
+    DOC
+    it 'has_ip_network existing ipaddress' do
+      apply_manifest(pp1, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{has_ip_network is true})
       end
     end
-    it 'has_ip_network absent ipaddress' do
-      pp = <<-EOS
+
+    pp2 = <<-DOC
       $a = '128.0.0.0'
       $o = has_ip_network($a)
       notice(inline_template('has_ip_network is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/has_ip_network is false/)
+    DOC
+    it 'has_ip_network absent ipaddress' do
+      apply_manifest(pp2, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{has_ip_network is false})
       end
     end
   end