diff modules/stdlib/spec/functions/is_float_spec.rb @ 275:d9352a684e62

Mass update of modules to remove deprecation warnings
author IBBoard <dev@ibboard.co.uk>
date Sun, 26 Jan 2020 11:36:07 +0000
parents c42fb28cff86
children
line wrap: on
line diff
--- a/modules/stdlib/spec/functions/is_float_spec.rb	Sat Jan 04 11:42:45 2020 +0000
+++ b/modules/stdlib/spec/functions/is_float_spec.rb	Sun Jan 26 11:36:07 2020 +0000
@@ -5,21 +5,17 @@
 
   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) }
-
-  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('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 'with deprecation warning' do
     after(:each) do
@@ -28,12 +24,12 @@
     # Checking for deprecation warning, which should only be provoked when the env variable for it is set.
     it 'displays a single deprecation' do
       ENV['STDLIB_LOG_DEPRECATIONS'] = 'true'
-      scope.expects(:warning).with(includes('This method is deprecated'))
+      expect(scope).to receive(:warning).with(include('This method is deprecated'))
       is_expected.to run.with_params(2.2).and_return(true)
     end
     it 'displays no warning for deprecation' do
       ENV['STDLIB_LOG_DEPRECATIONS'] = 'false'
-      scope.expects(:warning).with(includes('This method is deprecated')).never
+      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