summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Rakefile5
-rw-r--r--spec/spec_helper.rb2
2 files changed, 4 insertions, 3 deletions
diff --git a/Rakefile b/Rakefile
index 6b92f24..3bc7abd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -14,8 +14,11 @@ PuppetLint.configuration.send("disable_80chars")
# offers more possibilities like explicit version management, forge downloads,...
task :librarian_spec_prep do
sh "librarian-puppet install --path=spec/fixtures/modules/"
+ pwd = `pwd`.strip
+ unless File.directory?("#{pwd}/spec/fixtures/modules/munin")
+ sh "ln -s #{pwd} #{pwd}/spec/fixtures/modules/munin"
+ end
sh 'ls -laF spec/fixtures/modules'
- sh 'ls -laF spec/fixtures/modules/munin/manifests'
end
task :spec_prep => :librarian_spec_prep
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 7269ae5..70ab1fb 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,7 +1,5 @@
require 'puppetlabs_spec_helper/module_spec_helper'
-require 'rspec-puppet'
-
fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
RSpec.configure do |c|