Rework again to make a completely seperate module, site_apache, and u…

…se this for testing the template changes. Makes a lot more sense really.
puppetlabs · May 24, 2013 · f4ca555 · f4ca555
1 parent 4d51f69
commit f4ca555
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -5,4 +5,3 @@ fixtures:
     concat: "git://github.com/ripienaar/puppet-concat.git"
   symlinks:
     apache: "#{source_dir}"
-    apache/templates/fake.conf.erb: "../spec/fixtures/templates/fake.conf.erb"
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
@@ -258,7 +258,7 @@
       end
       context "with non-default" do
         let :params do
-          { :conf_template => 'apache/fake.conf.erb' }
+          { :conf_template => 'site_apache/fake.conf.erb' }
         end
         it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Fake template for rspec.$} }
       end

diff --git a/spec/fixtures/templates/fake.conf.erb → ...dules/site_apache/templates/fake.conf.erb b/spec/fixtures/templates/fake.conf.erb → ...dules/site_apache/templates/fake.conf.erb