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

diff --git a/3rdparty/modules/stdlib/spec/functions/is_array_spec.rb b/3rdparty/modules/stdlib/spec/functions/is_array_spec.rb
old mode 100755
new mode 100644
index e89f54b79..a24c2c70b
--- a/3rdparty/modules/stdlib/spec/functions/is_array_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/is_array_spec.rb
@@ -1,12 +1,11 @@
 require 'spec_helper'
 
 describe 'is_array' 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) }
   it {
-    pending("Current implementation ignores parameters after the first.")
-    is_expected.to run.with_params([], []).and_raise_error(Puppet::ParseError, /wrong number of arguments/i)
+    pending('Current implementation ignores parameters after the first.')
+    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_return(true) }
   it { is_expected.to run.with_params(['one']).and_return(true) }
@@ -17,19 +16,19 @@ describe 'is_array' do
   it { is_expected.to run.with_params('one').and_return(false) }
   it { is_expected.to run.with_params(1).and_return(false) }
   it { is_expected.to run.with_params({}).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(['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
   end