The template function now tries to first find a template within a module

(if the template path looks like it belongs to a module) and only when that
fails looks for it in templatedir


git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2277 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 17 insertions, 0 deletions

diff --git a/test/puppet/modules.rb b/test/puppet/modules.rb
index f3cf3b73c..e652182a8 100644
--- a/test/puppet/modules.rb
+++ b/test/puppet/modules.rb
@@ -38,4 +38,21 @@ class TestModules < Test::Unit::TestCase
         assert_equal("testmod", mod.name)
         assert_equal(path, mod.path)
     end
+
+    def test_find_template
+        templ = "testmod/templ.erb"
+        assert_equal(File::join(Puppet[:templatedir], templ),
+                     Puppet::Module::find_template(templ))
+
+        templ_path = File::join(@varmods, "testmod",
+                                Puppet::Module::TEMPLATES, "templ.erb")
+        FileUtils::mkdir_p(File::dirname(templ_path))
+        File::open(templ_path, "w") { |f| f.puts "Howdy" }
+
+        assert_equal(templ_path, Puppet::Module::find_template(templ))
+
+        mod = Puppet::Module::find(templ)
+        assert_not_nil(mod)
+        assert_equal(templ_path, mod.template(templ))
+    end
 end