Merge pull request #656 from HelenCampbell/hashFupdate

Add deprecation warnings to remaining validates

2 files changed, 23 insertions, 0 deletions

diff --git a/spec/functions/validate_hash_spec.rb b/spec/functions/validate_hash_spec.rb
index 2e8e59f..7b118e2 100755
--- a/spec/functions/validate_hash_spec.rb
+++ b/spec/functions/validate_hash_spec.rb
@@ -5,6 +5,18 @@ describe 'validate_hash' 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) }
 
+    describe 'check for deprecation warning' do
+      after(:context) do
+        ENV.delete('STDLIB_LOG_DEPRECATIONS')
+      end
+      # Checking for deprecation warning
+      it 'should display a single deprecation' do
+        ENV['STDLIB_LOG_DEPRECATIONS'] = "true"
+        scope.expects(:warning).with(includes('This method is deprecated'))
+        is_expected.to run.with_params({'key' => 'value'})
+      end
+    end
+
     describe 'valid inputs' do
       it { is_expected.to run.with_params({}) }
       it { is_expected.to run.with_params({'key' => 'value'}) }
diff --git a/spec/functions/validate_slength_spec.rb b/spec/functions/validate_slength_spec.rb
index 5a8fa6a..2ea253c 100755
--- a/spec/functions/validate_slength_spec.rb
+++ b/spec/functions/validate_slength_spec.rb
@@ -1,6 +1,17 @@
 require 'spec_helper'
 
 describe 'validate_slength' do
+  after(:context) do
+    ENV.delete('STDLIB_LOG_DEPRECATIONS')
+  end
+
+  # Checking for deprecation warning
+  it 'should display a single deprecation' do
+    ENV['STDLIB_LOG_DEPRECATIONS'] = "true"
+    scope.expects(:warning).with(includes('This method is deprecated'))
+    is_expected.to run.with_params('1234567890', 10)
+  end
+  
   describe 'signature validation' 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) }