X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fvalidate_ipv4_address_spec.rb;h=72c3e7a2d50c67406378aca28a2814cfd6adb0f2;hb=30caaa85aed7015ca0d77216bff175eebd917eb7;hp=6e4ca05465876d35bff03645acbf83345ddcb6d4;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/validate_ipv4_address_spec.rb b/3rdparty/modules/stdlib/spec/functions/validate_ipv4_address_spec.rb
old mode 100755
new mode 100644
index 6e4ca0546..72c3e7a2d
--- a/3rdparty/modules/stdlib/spec/functions/validate_ipv4_address_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/validate_ipv4_address_spec.rb
@@ -1,25 +1,24 @@
 require 'spec_helper'
 
 describe 'validate_ipv4_address' do
-
   describe 'signature validation' do
     it { is_expected.not_to eq(nil) }
-    it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
+    it { is_expected.to run.with_params.and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
   end
 
-  context 'Checking for deprecation warning', if: Puppet.version.to_f < 4.0 do
-    after(:all) do
+  context 'Checking for deprecation warning', :if => Puppet.version.to_f < 4.0 do
+    after(:each) do
       ENV.delete('STDLIB_LOG_DEPRECATIONS')
     end
     # Checking for deprecation warning, which should only be provoked when the env variable for it is set.
-    it 'should display a single deprecation' do
-      ENV['STDLIB_LOG_DEPRECATIONS'] = "true"
-      scope.expects(:warning).with(includes('This method is deprecated'))
+    it 'displays a single deprecation' do
+      ENV['STDLIB_LOG_DEPRECATIONS'] = 'true'
+      expect(scope).to receive(:warning).with(include('This method is deprecated'))
       is_expected.to run.with_params(SharedData::IPV4_PATTERNS.first)
     end
-    it 'should display no warning for deprecation' do
-      ENV['STDLIB_LOG_DEPRECATIONS'] = "false"
-      scope.expects(:warning).with(includes('This method is deprecated')).never
+    it 'displays no warning for deprecation' do
+      ENV['STDLIB_LOG_DEPRECATIONS'] = 'false'
+      expect(scope).to receive(:warning).with(include('This method is deprecated')).never
       is_expected.to run.with_params(SharedData::IPV4_PATTERNS.first)
     end
   end
@@ -29,13 +28,18 @@ describe 'validate_ipv4_address' do
   end
 
   SharedData::IPV4_NEGATIVE_PATTERNS.each do |value|
-    it { is_expected.to run.with_params(value).and_raise_error(Puppet::ParseError, /is not a valid IPv4/) }
+    it { is_expected.to run.with_params(value).and_raise_error(Puppet::ParseError, %r{is not a valid IPv4}) }
   end
 
   describe 'invalid inputs' do
-    [ {}, [], 1, true ].each do |invalid|
-      it { is_expected.to run.with_params(invalid).and_raise_error(Puppet::ParseError, /is not a string/) }
-      it { is_expected.to run.with_params(SharedData::IPV4_PATTERNS.first, invalid).and_raise_error(Puppet::ParseError, /is not a string/) }
+    [{}, [], 1, true].each do |invalid|
+      it { is_expected.to run.with_params(invalid).and_raise_error(Puppet::ParseError, %r{is not a string}) }
+      it { is_expected.to run.with_params(SharedData::IPV4_PATTERNS.first, invalid).and_raise_error(Puppet::ParseError, %r{is not a string}) }
     end
   end
+
+  describe 'multiple inputs' do
+    it { is_expected.to run.with_params(SharedData::IPV4_PATTERNS[0], SharedData::IPV4_PATTERNS[1]) }
+    it { is_expected.to run.with_params(SharedData::IPV4_PATTERNS[0], 'invalid ip').and_raise_error(Puppet::ParseError, %r{is not a valid IPv4}) }
+  end
 end