Update stdlib and concat to 6.1.0 both

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

diff --git a/3rdparty/modules/stdlib/spec/functions/validate_string_spec.rb b/3rdparty/modules/stdlib/spec/functions/validate_string_spec.rb
old mode 100755 (executable)
new mode 100644 (file)
index 0907ede..40522c6
--- a/3rdparty/modules/stdlib/spec/functions/validate_string_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/validate_string_spec.rb
@@ -1,20 +1,20 @@
 require 'spec_helper'
 
 describe 'validate_string' 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'))
+  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
 
   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 'valid inputs' do
       it { is_expected.to run.with_params('') }
@@ -24,10 +24,11 @@ describe 'validate_string' do
     end
 
     describe 'invalid inputs' do
-      it { is_expected.to run.with_params([]).and_raise_error(Puppet::ParseError, /is not a string/) }
-      it { is_expected.to run.with_params({}).and_raise_error(Puppet::ParseError, /is not a string/) }
-      it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, /is not a string/) }
-      it { is_expected.to run.with_params(true).and_raise_error(Puppet::ParseError, /is not a string/) }
+      it { is_expected.to run.with_params([]).and_raise_error(Puppet::ParseError, %r{is not a string}) }
+      it { is_expected.to run.with_params({}).and_raise_error(Puppet::ParseError, %r{is not a string}) }
+      it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, %r{is not a string}) }
+      it { is_expected.to run.with_params(true).and_raise_error(Puppet::ParseError, %r{is not a string}) }
+      it { is_expected.to run.with_params('one', 2).and_raise_error(Puppet::ParseError, %r{is not a string}) }
     end
   end
 end