Browse Source

using fixtures.yml for linking folders

Tomas Barton 10 years ago
parent
commit
3fdd59f654
2 changed files with 5 additions and 8 deletions
  1. 3 0
      .fixtures.yml
  2. 2 8
      Rakefile

+ 3 - 0
.fixtures.yml

@@ -0,0 +1,3 @@
+fixtures:
+  symlinks:
+    sshd: "#{source_dir}"

+ 2 - 8
Rakefile

@@ -8,15 +8,9 @@ require 'rspec-system/rake_task'
 PuppetLint.configuration.log_format = '%{path}:%{linenumber}:%{KIND}: %{message}'
 PuppetLint.configuration.send("disable_80chars")
 
-# use librarian-puppet to manage fixtures instead of .fixtures.yml
-# offers more possibilities like explicit version management, forge downloads,...
 puppet_module='sshd'
 task :librarian_spec_prep do
-  sh "librarian-puppet install --path=spec/fixtures/modules/"
-  pwd = `pwd`.strip
-  unless File.directory?("#{pwd}/spec/fixtures/modules/#{puppet_module}")
-    sh "ln -s #{pwd} #{pwd}/spec/fixtures/modules/#{puppet_module}"
-  end
+  sh 'librarian-puppet install --path=spec/fixtures/modules/'
 end
 task :spec_prep => :librarian_spec_prep
-task :default => [:spec, :lint]
+task :default => [:spec, :lint]