From 39148468abbd9b8af74b776eb49f0a8388fc8541 Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Mon, 15 Aug 2016 10:39:50 +0100 Subject: (maint) Switch 3.x deprecation() to use Puppet warning logger The deprecation function was calling the `Kernel#warn` function which prints to stderr, rather than the Puppet logger. This causes problems for Puppet module tests on Travis CI, which has a cap on the amount of stdout/err permitted in its logs and also prevents users from finding the deprecation warnings when running under a Puppet master. --- spec/functions/deprecation_spec.rb | 2 +- spec/functions/is_array_spec.rb | 2 +- spec/functions/is_bool_spec.rb | 2 +- spec/functions/is_float_spec.rb | 2 +- spec/functions/is_integer_spec.rb | 2 +- spec/functions/is_numeric_spec.rb | 2 +- spec/functions/is_string_spec.rb | 2 +- spec/functions/validate_absolute_path_spec.rb | 2 +- spec/functions/validate_array_spec.rb | 2 +- spec/functions/validate_bool_spec.rb | 2 +- spec/functions/validate_integer_spec.rb | 2 +- spec/functions/validate_numeric_spec.rb | 2 +- spec/functions/validate_re_spec.rb | 2 +- spec/functions/validate_string_spec.rb | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'spec/functions') diff --git a/spec/functions/deprecation_spec.rb b/spec/functions/deprecation_spec.rb index a596e24..c213190 100644 --- a/spec/functions/deprecation_spec.rb +++ b/spec/functions/deprecation_spec.rb @@ -46,7 +46,7 @@ else it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /wrong number of arguments/i) } it 'should display a single warning' do - scope.expects(:warn).with(includes('heelo')) + scope.expects(:warning).with(includes('heelo')) is_expected.to run.with_params('key', 'heelo') end end diff --git a/spec/functions/is_array_spec.rb b/spec/functions/is_array_spec.rb index e35ca44..0a8070b 100755 --- a/spec/functions/is_array_spec.rb +++ b/spec/functions/is_array_spec.rb @@ -4,7 +4,7 @@ describe 'is_array' do it { is_expected.not_to eq(nil) } # Checking for deprecation warning it 'should display a single deprecation' do - scope.expects(:warn).with(includes('This method is deprecated')) + scope.expects(:warning).with(includes('This method is deprecated')) is_expected.to run.with_params([]) end it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /wrong number of arguments/i) } diff --git a/spec/functions/is_bool_spec.rb b/spec/functions/is_bool_spec.rb index 9569856..4550e61 100755 --- a/spec/functions/is_bool_spec.rb +++ b/spec/functions/is_bool_spec.rb @@ -4,7 +4,7 @@ describe 'is_bool' do it { is_expected.not_to eq(nil) } # Checking for deprecation warning it 'should display a single deprecation' do - scope.expects(:warn).with(includes('This method is deprecated')) + scope.expects(:warning).with(includes('This method is deprecated')) is_expected.to run.with_params(true) end it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /wrong number of arguments/i) } diff --git a/spec/functions/is_float_spec.rb b/spec/functions/is_float_spec.rb index 267d9c6..cb7e148 100755 --- a/spec/functions/is_float_spec.rb +++ b/spec/functions/is_float_spec.rb @@ -5,7 +5,7 @@ describe 'is_float' do # Checking for deprecation warning it 'should display a single deprecation' do - scope.expects(:warn).with(includes('This method is deprecated')) + scope.expects(:warning).with(includes('This method is deprecated')) is_expected.to run.with_params(3) end diff --git a/spec/functions/is_integer_spec.rb b/spec/functions/is_integer_spec.rb index 49550c7..2d68731 100755 --- a/spec/functions/is_integer_spec.rb +++ b/spec/functions/is_integer_spec.rb @@ -5,7 +5,7 @@ describe 'is_integer' do # Checking for deprecation warning it 'should display a single deprecation' do - scope.expects(:warn).with(includes('This method is deprecated')) + scope.expects(:warning).with(includes('This method is deprecated')) is_expected.to run.with_params(3) end diff --git a/spec/functions/is_numeric_spec.rb b/spec/functions/is_numeric_spec.rb index b7de051..f4ead56 100755 --- a/spec/functions/is_numeric_spec.rb +++ b/spec/functions/is_numeric_spec.rb @@ -5,7 +5,7 @@ describe 'is_numeric' do # Checking for deprecation warning it 'should display a single deprecation' do - scope.expects(:warn).with(includes('This method is deprecated')) + scope.expects(:warning).with(includes('This method is deprecated')) is_expected.to run.with_params(3) end diff --git a/spec/functions/is_string_spec.rb b/spec/functions/is_string_spec.rb index 8056ed4..4f59b63 100755 --- a/spec/functions/is_string_spec.rb +++ b/spec/functions/is_string_spec.rb @@ -4,7 +4,7 @@ describe 'is_string' do it { is_expected.not_to eq(nil) } # Checking for deprecation warning it 'should display a single deprecation' do - scope.expects(:warn).with(includes('This method is deprecated')) + scope.expects(:warning).with(includes('This method is deprecated')) is_expected.to run.with_params('ha') end it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /wrong number of arguments/i) } diff --git a/spec/functions/validate_absolute_path_spec.rb b/spec/functions/validate_absolute_path_spec.rb index ffdb2c8..dbac88f 100755 --- a/spec/functions/validate_absolute_path_spec.rb +++ b/spec/functions/validate_absolute_path_spec.rb @@ -4,7 +4,7 @@ describe 'validate_absolute_path' do # Checking for deprecation warning it 'should display a single deprecation' do # called twice because validate_absolute_path calls is_absolute_path - scope.expects(:warn).with(includes('This method is deprecated')).twice + scope.expects(:warning).with(includes('This method is deprecated')).twice is_expected.to run.with_params('c:/') end diff --git a/spec/functions/validate_array_spec.rb b/spec/functions/validate_array_spec.rb index 0ba7108..9f2e210 100755 --- a/spec/functions/validate_array_spec.rb +++ b/spec/functions/validate_array_spec.rb @@ -5,7 +5,7 @@ describe 'validate_array' do it { is_expected.not_to eq(nil) } # Checking for deprecation warning it 'should display a single deprecation' do - scope.expects(:warn).with(includes('This method is deprecated')) + scope.expects(:warning).with(includes('This method is deprecated')) is_expected.to run.with_params([]) end it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /wrong number of arguments/i) } diff --git a/spec/functions/validate_bool_spec.rb b/spec/functions/validate_bool_spec.rb index b0f41a8..724e31f 100755 --- a/spec/functions/validate_bool_spec.rb +++ b/spec/functions/validate_bool_spec.rb @@ -4,7 +4,7 @@ describe 'validate_bool' do # Checking for deprecation warning it 'should display a single deprecation' do #called twice, because validate_bool calls is_bool - scope.expects(:warn).with(includes('This method is deprecated')).twice + scope.expects(:warning).with(includes('This method is deprecated')).twice is_expected.to run.with_params(true) end diff --git a/spec/functions/validate_integer_spec.rb b/spec/functions/validate_integer_spec.rb index 0eeab1e..3ca50b2 100755 --- a/spec/functions/validate_integer_spec.rb +++ b/spec/functions/validate_integer_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe 'validate_integer' do # Checking for deprecation warning it 'should display a single deprecation' do - scope.expects(:warn).with(includes('This method is deprecated')) + scope.expects(:warning).with(includes('This method is deprecated')) is_expected.to run.with_params(3) end diff --git a/spec/functions/validate_numeric_spec.rb b/spec/functions/validate_numeric_spec.rb index 2e5561e..2869e5f 100755 --- a/spec/functions/validate_numeric_spec.rb +++ b/spec/functions/validate_numeric_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe 'validate_numeric' do # Checking for deprecation warning it 'should display a single deprecation' do - scope.expects(:warn).with(includes('This method is deprecated')) + scope.expects(:warning).with(includes('This method is deprecated')) is_expected.to run.with_params(3) end diff --git a/spec/functions/validate_re_spec.rb b/spec/functions/validate_re_spec.rb index f6fa931..4b78a2e 100755 --- a/spec/functions/validate_re_spec.rb +++ b/spec/functions/validate_re_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe 'validate_re' do # Checking for deprecation warning it 'should display a single deprecation' do - scope.expects(:warn).with(includes('This method is deprecated')) + scope.expects(:warning).with(includes('This method is deprecated')) is_expected.to run.with_params('', '') end diff --git a/spec/functions/validate_string_spec.rb b/spec/functions/validate_string_spec.rb index 9bfef66..ef7a1b4 100755 --- a/spec/functions/validate_string_spec.rb +++ b/spec/functions/validate_string_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe 'validate_string' do # Checking for deprecation warning it 'should display a single deprecation' do - scope.expects(:warn).with(includes('This method is deprecated')) + scope.expects(:warning).with(includes('This method is deprecated')) is_expected.to run.with_params('', '') end -- cgit v1.2.3