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

diff --git a/3rdparty/modules/stdlib/spec/functions/validate_hash_spec.rb b/3rdparty/modules/stdlib/spec/functions/validate_hash_spec.rb
old mode 100755
new mode 100644
index 7533abe19..1c6213b78
--- a/3rdparty/modules/stdlib/spec/functions/validate_hash_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/validate_hash_spec.rb
@@ -3,36 +3,37 @@ require 'spec_helper'
 describe 'validate_hash' 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) }
 
     describe 'check for deprecation warning' do
-      after(:all) do
+      after(:each) do
         ENV.delete('STDLIB_LOG_DEPRECATIONS')
       end
       # 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'))
-        is_expected.to run.with_params({'key' => 'value'})
+      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('key' => 'value')
       end
     end
 
     describe 'valid inputs' do
       it { is_expected.to run.with_params({}) }
-      it { is_expected.to run.with_params({'key' => 'value'}) }
-      it { is_expected.to run.with_params({}, {'key' => 'value'}) }
-      it { is_expected.to run.with_params({'key1' => 'value1'}, {'key2' => 'value2'}) }
+      it { is_expected.to run.with_params('key' => 'value') }
+      it { is_expected.to run.with_params({}, 'key' => 'value') }
+      it { is_expected.to run.with_params({ 'key1' => 'value1' }, 'key2' => 'value2') }
     end
 
     describe 'invalid inputs' do
-      it { is_expected.to run.with_params([]).and_raise_error(Puppet::ParseError, /is not a Hash/) }
-      it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, /is not a Hash/) }
-      it { is_expected.to run.with_params(true).and_raise_error(Puppet::ParseError, /is not a Hash/) }
-      it { is_expected.to run.with_params('one').and_raise_error(Puppet::ParseError, /is not a Hash/) }
-      it { is_expected.to run.with_params({}, []).and_raise_error(Puppet::ParseError, /is not a Hash/) }
-      it { is_expected.to run.with_params({}, 1).and_raise_error(Puppet::ParseError, /is not a Hash/) }
-      it { is_expected.to run.with_params({}, true).and_raise_error(Puppet::ParseError, /is not a Hash/) }
-      it { is_expected.to run.with_params({}, 'one').and_raise_error(Puppet::ParseError, /is not a Hash/) }
+      it { is_expected.to run.with_params([]).and_raise_error(Puppet::ParseError, %r{is not a Hash}) }
+      it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, %r{is not a Hash}) }
+      it { is_expected.to run.with_params(true).and_raise_error(Puppet::ParseError, %r{is not a Hash}) }
+      it { is_expected.to run.with_params('one').and_raise_error(Puppet::ParseError, %r{is not a Hash}) }
+      it { is_expected.to run.with_params({}, []).and_raise_error(Puppet::ParseError, %r{is not a Hash}) }
+      it { is_expected.to run.with_params({}, 1).and_raise_error(Puppet::ParseError, %r{is not a Hash}) }
+      it { is_expected.to run.with_params({}, true).and_raise_error(Puppet::ParseError, %r{is not a Hash}) }
+      it { is_expected.to run.with_params({}, 'one').and_raise_error(Puppet::ParseError, %r{is not a Hash}) }
+      it { is_expected.to run.with_params("{ 'number' => 'one' }").and_raise_error(Puppet::ParseError, %r{is not a Hash}) }
     end
   end
 end