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

diff --git a/3rdparty/modules/stdlib/spec/functions/is_string_spec.rb b/3rdparty/modules/stdlib/spec/functions/is_string_spec.rb
old mode 100755
new mode 100644
index e92f85cc7..1fb5264ba
--- a/3rdparty/modules/stdlib/spec/functions/is_string_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/is_string_spec.rb
@@ -1,12 +1,11 @@
 require 'spec_helper'
 
 describe 'is_string' 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(3).and_return(false) }
@@ -17,7 +16,7 @@ describe 'is_string' do
   it { is_expected.to run.with_params(3.7).and_return(false) }
   it { is_expected.to run.with_params('3.7').and_return(false) }
   it { is_expected.to run.with_params(-3.7).and_return(false) }
-  it { is_expected.to run.with_params('3.7').and_return(false) }
+  it { is_expected.to run.with_params('-3.7').and_return(false) }
 
   it { is_expected.to run.with_params([]).and_return(false) }
   it { is_expected.to run.with_params([1]).and_return(false) }
@@ -26,22 +25,22 @@ describe 'is_string' do
   it { is_expected.to run.with_params(false).and_return(false) }
   it { is_expected.to run.with_params('one').and_return(true) }
   it { is_expected.to run.with_params('0001234').and_return(true) }
+  it { is_expected.to run.with_params('aaa' => 'www.com').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
     # 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('sponge').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('bob').and_return(true)
     end
-  end 
-
+  end
 end