aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--spec/spec_helper.rb15
2 files changed, 2 insertions, 15 deletions
diff --git a/Gemfile b/Gemfile
index a47fea7..f1bdbfc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
group :development, :unit_tests do
gem 'rake', :require => false
- gem 'rspec-puppet', :require => false
+ gem 'rspec-puppet', :require => false, :git => 'https://github.com/camptocamp/rspec-puppet.git', :branch => 'rspec3'
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', '~> 1.0.0', :require => false
gem 'puppet-lint-unquoted_string-check', :require => false
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1148f7f..86cc740 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -7,24 +7,11 @@ RSpec.configure do |c|
c.include PuppetlabsSpec::Files
c.before :each do
- # Ensure that we don't accidentally cache facts and environment
- # between test cases.
- Facter::Util::Loader.any_instance.stubs(:load_all)
- Facter.clear
- Facter.clear_messages
-
# Store any environment variables away to be restored later
@old_env = {}
ENV.each_key {|k| @old_env[k] = ENV[k]}
- if Gem::Version.new(`puppet --version`) >= Gem::Version.new('3.5')
- Puppet.settings[:strict_variables]=true
- end
-
- if ENV['FUTURE_PARSER'] == 'yes'
- c.parser='future'
- end
-
+ Puppet.settings[:strict_variables]=true if Gem::Version.new(Puppet::PUPPETVERSION) >= Gem::Version.new('3.5')
Puppet.features.stubs(:root?).returns(true)
end