Merge pull request #36189 from st0012/fix-36154

Clear Resolvers' cache after RenderTestCases tests

actionview/test/template/render_test.rb

@@ -33,6 +33,11 @@ def combined_fragment_cache_key(key)
     assert_equal ORIGINAL_LOCALES, I18n.available_locales.map(&:to_s).sort
   end
 
+  def teardown
+    I18n.reload!
+    ActionController::Base.view_paths.map(&:clear_cache)
+  end
+
   def test_implicit_format_comes_from_parent_template
     rendered_templates = JSON.parse(@controller_view.render(template: "test/mixing_formats"))
     assert_equal({ "format" => "HTML",
@@ -680,7 +685,7 @@ def setup
 
   def teardown
     GC.start
-    I18n.reload!
+    super
   end
 end
 
@@ -699,7 +704,7 @@ def setup
 
   def teardown
     GC.start
-    I18n.reload!
+    super
   end
 
   def test_render_utf8_template_with_magic_comment
@@ -758,8 +763,8 @@ class CachedCustomer < Customer; end
     setup_view(view_paths)
   end
 
-  teardown do
-    I18n.reload!
+  def teardown
+    super
   end
 
   test "template body written to cache" do