Merge pull request #641 from HelenCampbell/deprecationUpdate

Deprecation function to be mutable in all cases

1 files changed, 18 insertions, 3 deletions

diff --git a/spec/functions/validate_ip_address_spec.rb b/spec/functions/validate_ip_address_spec.rb
index 10f6c37..7040a8d 100644
--- a/spec/functions/validate_ip_address_spec.rb
+++ b/spec/functions/validate_ip_address_spec.rb
@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe 'validate_ip_address' do
+
   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) }
@@ -19,10 +20,24 @@ describe 'validate_ip_address' do
     it { is_expected.to run.with_params('3ffe:0505:0002::', '3ffe:0505:0002::2') }
     it { is_expected.to run.with_params('::1/64') }
     it { is_expected.to run.with_params('fe80::a00:27ff:fe94:44d6/64') }
-    it 'should display a single deprecation' do
-      scope.expects(:warning).with(includes('This method is deprecated'))
-      is_expected.to run.with_params('1.1.1.1')
+
+    context 'Checking for deprecation warning', if: Puppet.version.to_f < 4.0 do
+      after(:context) 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'))
+        is_expected.to run.with_params('1.2.3.4')
+      end
+      it 'should display no warning for deprecation' do
+        ENV['STDLIB_LOG_DEPRECATIONS'] = "false"
+        scope.expects(:warning).with(includes('This method is deprecated')).never
+        is_expected.to run.with_params('1.2.3.4')
+      end
     end
+    
     context 'with netmasks' do
       it { is_expected.to run.with_params('8.8.8.8/0') }
       it { is_expected.to run.with_params('8.8.8.8/16') }