Reset assert_template instance variables between requests [#5832 stat…

…e:resolved]
gjastrab · Oct 18, 2010 · f757317 · f757317
1 parent 7b2ec38
commit f757317
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
@@ -40,6 +40,13 @@ def teardown_subscriptions
       ActiveSupport::Notifications.unsubscribe("!render_template.action_view")
     end
 
+    def process(*args)
+      @partials = Hash.new(0)
+      @templates = Hash.new(0)
+      @layouts = Hash.new(0)
+      super
+    end
+
     # Asserts that the request was rendered with the appropriate template file or partials.
     #
     # ==== Examples

diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -465,6 +465,14 @@ def test_fails_with_incorrect_symbol
       assert_template :hello_planet
     end
   end
+
+  def test_assert_template_reset_between_requests
+    get :hello_world
+    assert_template 'test/hello_world'
+
+    get :nothing
+    assert_template nil
+  end
 end
 
 class ActionPackHeaderTest < ActionController::TestCase