1 files changed, 14 insertions, 2 deletions
diff --git a/actionview/test/template/test_case_test.rb b/actionview/test/template/test_case_test.rb
index 4ee0930341..5ad1938b61 100644
--- a/actionview/test/template/test_case_test.rb
+++ b/actionview/test/template/test_case_test.rb
@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'rails/engine'
 
 module ActionView
 
@@ -154,7 +155,7 @@ module ActionView
     test "view_assigns excludes internal ivars" do
       INTERNAL_IVARS.each do |ivar|
         assert defined?(ivar), "expected #{ivar} to be defined"
-        assert !view_assigns.keys.include?(ivar.to_s.sub('@', '').to_sym), "expected #{ivar} to be excluded from view_assigns"
+        assert !view_assigns.keys.include?(ivar.to_s.tr('@', '').to_sym), "expected #{ivar} to be excluded from view_assigns"
       end
     end
   end
@@ -223,7 +224,7 @@ module ActionView
 
     test "is able to use mounted routes" do
       with_routing do |set|
-        app = Class.new do
+        app = Class.new(Rails::Engine) do
           def self.routes
             @routes ||= ActionDispatch::Routing::RouteSet.new
           end
@@ -292,6 +293,17 @@ module ActionView
         assert_select 'li', :text => 'foo'
       end
     end
+
+    test "do not memoize the document_root_element in view tests" do
+      concat form_tag('/foo')
+
+      assert_select 'form'
+
+      concat content_tag(:b, 'Strong', class: 'foo')
+
+      assert_select 'form'
+      assert_select 'b.foo'
+    end
   end
 
   class RenderTemplateTest < ActionView::TestCase