From c8080b8303d952a50c946e33a3f331f481d93316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?=
 <mickael.canevet@camptocamp.com>
Date: Thu, 19 Jun 2014 11:52:42 +0200
Subject: Auto enable strict_variables for unit tests when puppet > 3.5

---
 .travis.yml         | 2 +-
 spec/spec_helper.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7480714..bf7edeb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ env:
     - PUPPET_GEM_VERSION="~> 3.2.0"
     - PUPPET_GEM_VERSION="~> 3.3.0"
     - PUPPET_GEM_VERSION="~> 3.4.0"
-    - PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
+    - PUPPET_GEM_VERSION="~> 3.5.0"
   global:
   - PUBLISHER_LOGIN=saz
   - secure: |-
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a05654b..12bb0b7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -17,7 +17,7 @@ RSpec.configure do |c|
     @old_env = {}
     ENV.each_key {|k| @old_env[k] = ENV[k]}
 
-    if ENV['STRICT_VARIABLES'] == 'yes'
+    if Gem::Version.new(`puppet --version`) >= Gem::Version.new('3.5')
       Puppet.settings[:strict_variables]=true
     end
   end
-- 
cgit v1.2.3