From 0ea4ffa9a238d1f8fcbf6a73cba472ede78a4e18 Mon Sep 17 00:00:00 2001
From: Ken Barber <ken@bob.sh>
Date: Wed, 21 Mar 2012 13:21:50 +0000
Subject: [PATCH] (#13289) Change test scaffolding to use a module & manifest
 dir fixture path

This removes the need for depending on a global site.pp, and depending on the
checked out apt module to be called 'apt' as well.

It pulls in stdlib via sub-modules as I don't have a better way to deal with
dependencies yet. It has pinned the revision for stdlib to 2.2.1 which is the
minimum required version for apt to work.
---
 .gitmodules                     | 3 +++
 spec/fixtures/manifests/site.pp | 0
 spec/fixtures/modules/apt       | 1 +
 spec/fixtures/modules/stdlib    | 1 +
 spec/spec_helper.rb             | 7 +++++--
 5 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 .gitmodules
 create mode 100644 spec/fixtures/manifests/site.pp
 create mode 120000 spec/fixtures/modules/apt
 create mode 160000 spec/fixtures/modules/stdlib

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..eb34d3b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "spec/fixtures/modules/stdlib"]
+	path = spec/fixtures/modules/stdlib
+	url = https://github.com/puppetlabs/puppetlabs-stdlib.git
diff --git a/spec/fixtures/manifests/site.pp b/spec/fixtures/manifests/site.pp
new file mode 100644
index 0000000..e69de29
diff --git a/spec/fixtures/modules/apt b/spec/fixtures/modules/apt
new file mode 120000
index 0000000..1b20c9f
--- /dev/null
+++ b/spec/fixtures/modules/apt
@@ -0,0 +1 @@
+../../../
\ No newline at end of file
diff --git a/spec/fixtures/modules/stdlib b/spec/fixtures/modules/stdlib
new file mode 160000
index 0000000..a70b09d
--- /dev/null
+++ b/spec/fixtures/modules/stdlib
@@ -0,0 +1 @@
+Subproject commit a70b09d5de035de5254ebe6ad6e1519a6d7cf588
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index d2648da..46fe237 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,11 +1,14 @@
-require 'puppet'
 require 'rubygems'
+require 'puppet'
 require 'rspec-puppet'
 
 def param_value(subject, type, title, param)
   subject.resource(type, title).send(:parameters)[param.to_sym]
 end
 
+fixture_path = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))
+
 RSpec.configure do |c|
-  c.module_path = File.join(File.dirname(__FILE__), '../../')
+  c.module_path = File.join(fixture_path, 'modules')
+  c.manifest_dir = File.join(fixture_path, 'manifests')
 end
-- 
2.45.2