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

diff --git a/3rdparty/modules/stdlib/spec/functions/is_float_spec.rb b/3rdparty/modules/stdlib/spec/functions/is_float_spec.rb
old mode 100755
new mode 100644
index af3322e7e..a231446fa
--- a/3rdparty/modules/stdlib/spec/functions/is_float_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/is_float_spec.rb
@@ -1,42 +1,36 @@
 require 'spec_helper'
 
 describe 'is_float' 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(0.1, 0.2).and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
-
-  describe 'passing a string' do
-    it { is_expected.to run.with_params('0.1').and_return(true) }
-    it { is_expected.to run.with_params('1.0').and_return(true) }
-    it { is_expected.to run.with_params('1').and_return(false) }
-    it { is_expected.to run.with_params('one').and_return(false) }
-    it { is_expected.to run.with_params('one 1.0').and_return(false) }
-    it { is_expected.to run.with_params('1.0 one').and_return(false) }
-  end
-
-  describe 'passing numbers' do
-    it { is_expected.to run.with_params(0.1).and_return(true) }
-    it { is_expected.to run.with_params(1.0).and_return(true) }
-    it { is_expected.to run.with_params(1).and_return(false) }
-  end
+  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(0.1, 0.2).and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
+  it { is_expected.to run.with_params('0.1').and_return(true) }
+  it { is_expected.to run.with_params('1.0').and_return(true) }
+  it { is_expected.to run.with_params('1').and_return(false) }
+  it { is_expected.to run.with_params('one').and_return(false) }
+  it { is_expected.to run.with_params('one 1.0').and_return(false) }
+  it { is_expected.to run.with_params('1.0 one').and_return(false) }
+  it { is_expected.to run.with_params(0.1).and_return(true) }
+  it { is_expected.to run.with_params(1.0).and_return(true) }
+  it { is_expected.to run.with_params(1).and_return(false) }
+  it { is_expected.to run.with_params({}).and_return(false) }
+  it { is_expected.to run.with_params([]).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(2.2).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(1.0).and_return(true)
     end
   end
-
 end