Update puppetlabs/stdlib module

[mirror/dsa-puppet.git] / 3rdparty / modules / stdlib / spec / functions / is_ip_address_spec.rb

diff --git a/3rdparty/modules/stdlib/spec/functions/is_ip_address_spec.rb b/3rdparty/modules/stdlib/spec/functions/is_ip_address_spec.rb
old mode 100755 (executable)
new mode 100644 (file)
index 39525d7..daa09db
--- a/3rdparty/modules/stdlib/spec/functions/is_ip_address_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/is_ip_address_spec.rb
@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe 'is_ip_address' 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, /wrong number of arguments/i) }
+  it { is_expected.to run.with_params.and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
+  it { is_expected.to run.with_params([], []).and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
   it { is_expected.to run.with_params('1.2.3.4').and_return(true) }
   it { is_expected.to run.with_params('1.2.3.255').and_return(true) }
   it { is_expected.to run.with_params('1.2.3.256').and_return(false) }
@@ -21,19 +21,19 @@ describe 'is_ip_address' do
   it { is_expected.to run.with_params({}).and_return(false) }
   it { is_expected.to run.with_params([]).and_return(false) }
 
-  context 'Checking for deprecation warning', if: Puppet.version.to_f < 4.0 do
+  context 'Checking for deprecation warning', :if => Puppet.version.to_f < 4.0 do
     # 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('1.2.3.4').and_return(true)
     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('1.2.3.4').and_return(true)
     end
-    after(:all) do 
+    after(:each) do
       ENV.delete('STDLIB_LOG_DEPRECATIONS')
     end
   end