Merge pull request #641 from HelenCampbell/deprecationUpdate

Deprecation function to be mutable in all cases

1 files changed, 17 insertions, 5 deletions

diff --git a/spec/functions/is_array_spec.rb b/spec/functions/is_array_spec.rb
index 0a8070b..2350b7f 100755
--- a/spec/functions/is_array_spec.rb
+++ b/spec/functions/is_array_spec.rb
@@ -1,12 +1,8 @@
 require 'spec_helper'
 
 describe 'is_array' do
+  
   it { is_expected.not_to eq(nil) }
-  # Checking for deprecation warning
-  it 'should display a single deprecation' do
-    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) }
   it {
     pending("Current implementation ignores parameters after the first.")
@@ -21,4 +17,20 @@ describe 'is_array' do
   it { is_expected.to run.with_params('one').and_return(false) }
   it { is_expected.to run.with_params(1).and_return(false) }
   it { is_expected.to run.with_params({}).and_return(false) }
+  context 'Checking for deprecation warning' 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']).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
+      is_expected.to run.with_params(['1.2.3.4']).and_return(true)
+    end
+  end
 end