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

diff --git a/3rdparty/modules/stdlib/spec/functions/is_integer_spec.rb b/3rdparty/modules/stdlib/spec/functions/is_integer_spec.rb
old mode 100755
new mode 100644
index 8118ef447..7e9300568
--- a/3rdparty/modules/stdlib/spec/functions/is_integer_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/is_integer_spec.rb
@@ -1,11 +1,10 @@
 require 'spec_helper'
 
 describe 'is_integer' 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(1, 2).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 { is_expected.to run.with_params(1, 2).and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
 
   it { is_expected.to run.with_params(3).and_return(true) }
   it { is_expected.to run.with_params('3').and_return(true) }
@@ -17,7 +16,7 @@ describe 'is_integer' 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('one').and_return(false) }
   it { is_expected.to run.with_params([]).and_return(false) }
@@ -28,21 +27,20 @@ describe 'is_integer' do
   it { is_expected.to run.with_params('0001234').and_return(false) }
   it { is_expected.to run.with_params("foo\nbar").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(50).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(50).and_return(true)
     end
-  end 
-
+  end
 end