0
@@ -48,18 +48,8 @@ module Haml
0
     # with <tt>local_assigns</tt> available as local variables within the template.
0
     # Returns the result as a string.
0
     def render(template, local_assigns={})
0
-      unless @view.instance_variable_get("@assigns_added")
0
-        assigns = @view.assigns.dup
0
-      
0
-        # Get inside the view object's world
0
-        @view.instance_eval do
0
-          # Set all the instance variables
0
-          assigns.each do |key,val|
0
-            instance_variable_set "@#{key}", val
0
-          end
0
-        end
0
-        
0
-        @view.instance_variable_set("@assigns_added", true)
0
+      @view.instance_eval do
0
+        evaluate_assigns
0
       end
0
 
0
       options = @@options.dup

0
@@ -16,9 +16,7 @@ class TemplateTest < Test::Unit::TestCase
0
 
0
   def setup
0
     ActionView::Base.register_template_handler("haml", Haml::Template)
0
-    @base = ActionView::Base.new(File.dirname(__FILE__) + "/templates/")
0
-    @base.instance_variable_set("@article", Article.new)
0
-    @base.instance_variable_set("@foo", 'value one')
0
+    @base = ActionView::Base.new(File.dirname(__FILE__) + "/templates/", {'article' => Article.new, 'foo' => 'value one'})
0
   end
0
 
0
   def render(text)