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

diff --git a/3rdparty/modules/stdlib/spec/functions/is_bool_spec.rb b/3rdparty/modules/stdlib/spec/functions/is_bool_spec.rb
old mode 100755
new mode 100644
index d21345c26..2a8112e67
--- a/3rdparty/modules/stdlib/spec/functions/is_bool_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/is_bool_spec.rb
@@ -1,10 +1,9 @@
 require 'spec_helper'
 
 describe 'is_bool' 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(true, false).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(true, false).and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
   it { is_expected.to run.with_params(true).and_return(true) }
   it { is_expected.to run.with_params(false).and_return(true) }
   it { is_expected.to run.with_params([1]).and_return(false) }
@@ -13,21 +12,20 @@ describe 'is_bool' do
   it { is_expected.to run.with_params([true]).and_return(false) }
   it { is_expected.to run.with_params('true').and_return(false) }
   it { is_expected.to run.with_params('false').and_return(false) }
-  context 'Checking for deprecation warning' do
-    after(:all) do
+  context 'with deprecation warning' do
+    after(:each) do
       ENV.delete('STDLIB_LOG_DEPRECATIONS')
-    end 
+    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(true).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(false).and_return(true)
     end
-  end 
+  end
 end
-