Added tests for TemplateWrapper's use of Scope#to_hash.

We should deprecate the method_missing stuff in 0.25.

Signed-off-by: Luke Kanies <luke@madstop.com>

1 files changed, 10 insertions, 11 deletions

diff --git a/lib/puppet/parser/templatewrapper.rb b/lib/puppet/parser/templatewrapper.rb
index 298428f63..3b74e62d4 100644
--- a/lib/puppet/parser/templatewrapper.rb
+++ b/lib/puppet/parser/templatewrapper.rb
@@ -18,15 +18,6 @@ class Puppet::Parser::TemplateWrapper
         if scope.parser
             scope.parser.watch_file(file)
         end
-
-        # Expose all the variables in our scope as instance variables of the
-        # current object, making it possible to access them without conflict
-        # to the regular methods.
-        benchmark(:debug, "Bound template variables for #{file}") do
-            scope.to_hash.each { |name, value| 
-                instance_variable_set("@#{name}", value) 
-            }
-        end
     end
 
     def scope
@@ -67,12 +58,20 @@ class Puppet::Parser::TemplateWrapper
         else
             # Just throw an error immediately, instead of searching for
             # other missingmethod things or whatever.
-            raise Puppet::ParseError,
-                "Could not find value for '%s'" % name
+            raise Puppet::ParseError, "Could not find value for '%s'" % name
         end
     end
 
     def result
+        # Expose all the variables in our scope as instance variables of the
+        # current object, making it possible to access them without conflict
+        # to the regular methods.
+        benchmark(:debug, "Bound template variables for #{file}") do
+            scope.to_hash.each { |name, value| 
+                instance_variable_set("@#{name}", value) 
+            }
+        end
+
         result = nil
         benchmark(:debug, "Interpolated template #{file}") do
             template = ERB.new(File.read(file), 0, "-")