summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Rakefile1
-rw-r--r--spec/spec_helper.rb2
2 files changed, 3 insertions, 0 deletions
diff --git a/Rakefile b/Rakefile
index cac9471..64cc262 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,5 @@
require 'rake'
+require 'rubygems'
require 'rspec/core/rake_task'
task :default do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 10afd38..1474db1 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -11,9 +11,11 @@ RSpec.configure do |c|
Dir.mkdir(manifestdir)
FileUtils.touch(File.join(manifestdir, "site.pp"))
Puppet[:confdir] = @puppetdir
+ Puppet.settings.send(:initialize_everything_for_tests) unless Puppet.version =~ /^2\.6/
end
c.after :each do
+ Puppet.settings.send(:clear_everything_for_tests) unless Puppet.version =~ /^2\.6/
FileUtils.remove_entry_secure(@puppetdir)
end