Suggest different variables to use if we want to tunnel both v4 and v6

[mirror/dsa-puppet.git] / 3rdparty / modules / stdlib / spec / acceptance / has_ip_network_spec.rb

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 (executable)
new mode 100644 (file)
index f7a7d35..e18f050
--- 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