aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-05-06 23:23:56 +0900
committerGitHub <noreply@github.com>2019-05-06 23:23:56 +0900
commitf0f7d342ff036f1d6e89a2967351d90087fcb5f1 (patch)
treeda3bd780a0b9419f544b6fe6b810df271eac29f0 /actionview
parent85a8bc644be69908f05740a5886ec19cd3679df5 (diff)
parent34a33f8b0c234fcbc06a15c958b079a0f5b4400c (diff)
downloadrails-f0f7d342ff036f1d6e89a2967351d90087fcb5f1.tar.gz
rails-f0f7d342ff036f1d6e89a2967351d90087fcb5f1.tar.bz2
rails-f0f7d342ff036f1d6e89a2967351d90087fcb5f1.zip
Merge pull request #36189 from st0012/fix-36154
Clear Resolvers' cache after RenderTestCases tests
Diffstat (limited to 'actionview')
-rw-r--r--actionview/test/template/render_test.rb13
1 files changed, 9 insertions, 4 deletions
diff --git a/actionview/test/template/render_test.rb b/actionview/test/template/render_test.rb
index f0b5d7d95e..4bc7d72464 100644
--- a/actionview/test/template/render_test.rb
+++ b/actionview/test/template/render_test.rb
@@ -33,6 +33,11 @@ module RenderTestCases
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 @@ class CachedViewRenderTest < ActiveSupport::TestCase
def teardown
GC.start
- I18n.reload!
+ super
end
end
@@ -699,7 +704,7 @@ class LazyViewRenderTest < ActiveSupport::TestCase
def teardown
GC.start
- I18n.reload!
+ super
end
def test_render_utf8_template_with_magic_comment
@@ -758,8 +763,8 @@ class CachedCollectionViewRenderTest < ActiveSupport::TestCase
setup_view(view_paths)
end
- teardown do
- I18n.reload!
+ def teardown
+ super
end
test "template body written to cache" do