Update stdlib and concat to 6.1.0 both

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

diff --git a/3rdparty/modules/stdlib/spec/functions/validate_array_spec.rb b/3rdparty/modules/stdlib/spec/functions/validate_array_spec.rb
old mode 100755 (executable)
new mode 100644 (file)
index 409b3dc..87b7c24
--- a/3rdparty/modules/stdlib/spec/functions/validate_array_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/validate_array_spec.rb
@@ -1,19 +1,18 @@
 require 'spec_helper'
 
 describe 'validate_array' do
-
   describe 'signature validation' do
-    after(:all) do
+    after(:each) do
       ENV.delete('STDLIB_LOG_DEPRECATIONS')
     end
     it { is_expected.not_to eq(nil) }
     # Checking for deprecation warning
-    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([])
     end
-    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) }
 
     describe 'valid inputs' do
       it { is_expected.to run.with_params([]) }
@@ -23,15 +22,15 @@ describe 'validate_array' do
     end
 
     describe 'invalid inputs' do
-      it { is_expected.to run.with_params({}).and_raise_error(Puppet::ParseError, /is not an Array/) }
-      it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, /is not an Array/) }
-      it { is_expected.to run.with_params(true).and_raise_error(Puppet::ParseError, /is not an Array/) }
-      it { is_expected.to run.with_params('one').and_raise_error(Puppet::ParseError, /is not an Array/) }
-      it { is_expected.to run.with_params([], {}).and_raise_error(Puppet::ParseError, /is not an Array/) }
-      it { is_expected.to run.with_params([], 1).and_raise_error(Puppet::ParseError, /is not an Array/) }
-      it { is_expected.to run.with_params([], true).and_raise_error(Puppet::ParseError, /is not an Array/) }
-      it { is_expected.to run.with_params([], 'one').and_raise_error(Puppet::ParseError, /is not an Array/) }
+      it { is_expected.to run.with_params({}).and_raise_error(Puppet::ParseError, %r{is not an Array}) }
+      it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, %r{is not an Array}) }
+      it { is_expected.to run.with_params(true).and_raise_error(Puppet::ParseError, %r{is not an Array}) }
+      it { is_expected.to run.with_params('one').and_raise_error(Puppet::ParseError, %r{is not an Array}) }
+      it { is_expected.to run.with_params([], {}).and_raise_error(Puppet::ParseError, %r{is not an Array}) }
+      it { is_expected.to run.with_params([], 1).and_raise_error(Puppet::ParseError, %r{is not an Array}) }
+      it { is_expected.to run.with_params([], true).and_raise_error(Puppet::ParseError, %r{is not an Array}) }
+      it { is_expected.to run.with_params([], 'one').and_raise_error(Puppet::ParseError, %r{is not an Array}) }
+      it { is_expected.to run.with_params(nil).and_raise_error(Puppet::ParseError, %r{is not an Array}) }
     end
   end
 end
-