aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/test
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2019-02-08 14:43:22 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2019-02-08 16:13:03 -0800
commitf369b63ad69ac8bb29811e145a148dd109de777c (patch)
tree8c13982ee9f98929f532ab6865640806d9e6e5e7 /actionview/test
parent6124eb02c63b666e640e778bf74380c3772926a0 (diff)
downloadrails-f369b63ad69ac8bb29811e145a148dd109de777c.tar.gz
rails-f369b63ad69ac8bb29811e145a148dd109de777c.tar.bz2
rails-f369b63ad69ac8bb29811e145a148dd109de777c.zip
Teach DetailsKey how to clear the template cache
This commit exposes all system wide view paths so that we can clear their caches.
Diffstat (limited to 'actionview/test')
-rw-r--r--actionview/test/template/log_subscriber_test.rb4
-rw-r--r--actionview/test/template/render_test.rb11
-rw-r--r--actionview/test/template/streaming_render_test.rb4
3 files changed, 9 insertions, 10 deletions
diff --git a/actionview/test/template/log_subscriber_test.rb b/actionview/test/template/log_subscriber_test.rb
index 4574b798d9..83bb651ea3 100644
--- a/actionview/test/template/log_subscriber_test.rb
+++ b/actionview/test/template/log_subscriber_test.rb
@@ -11,9 +11,9 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
def setup
super
+ ActionView::LookupContext::DetailsKey.clear
+
view_paths = ActionController::Base.view_paths
- view_paths.each(&:clear_cache)
- ActionView::LookupContext.fallbacks.each(&:clear_cache)
lookup_context = ActionView::LookupContext.new(view_paths, {}, ["test"])
renderer = ActionView::Renderer.new(lookup_context)
diff --git a/actionview/test/template/render_test.rb b/actionview/test/template/render_test.rb
index b8d8717db4..bbecc404be 100644
--- a/actionview/test/template/render_test.rb
+++ b/actionview/test/template/render_test.rb
@@ -631,9 +631,8 @@ class CachedViewRenderTest < ActiveSupport::TestCase
# Ensure view path cache is primed
def setup
+ ActionView::LookupContext::DetailsKey.clear
view_paths = ActionController::Base.view_paths
- view_paths.each(&:clear_cache)
- ActionView::LookupContext.fallbacks.each(&:clear_cache)
assert_equal ActionView::OptimizedFileSystemResolver, view_paths.first.class
setup_view(view_paths)
end
@@ -650,9 +649,9 @@ class LazyViewRenderTest < ActiveSupport::TestCase
# Test the same thing as above, but make sure the view path
# is not eager loaded
def setup
+ ActionView::LookupContext::DetailsKey.clear
+
view_paths = ActionController::Base.view_paths
- view_paths.each(&:clear_cache)
- ActionView::LookupContext.fallbacks.each(&:clear_cache)
path = ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH)
view_paths = ActionView::PathSet.new([path])
assert_equal ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH), view_paths.first
@@ -710,10 +709,10 @@ class CachedCollectionViewRenderTest < ActiveSupport::TestCase
# Ensure view path cache is primed
setup do
+ ActionView::LookupContext::DetailsKey.clear
+
view_paths = ActionController::Base.view_paths
assert_equal ActionView::OptimizedFileSystemResolver, view_paths.first.class
- view_paths.each(&:clear_cache)
- ActionView::LookupContext.fallbacks.each(&:clear_cache)
ActionView::PartialRenderer.collection_cache = ActiveSupport::Cache::MemoryStore.new
diff --git a/actionview/test/template/streaming_render_test.rb b/actionview/test/template/streaming_render_test.rb
index 4567ee31b4..a5b59a700e 100644
--- a/actionview/test/template/streaming_render_test.rb
+++ b/actionview/test/template/streaming_render_test.rb
@@ -7,9 +7,9 @@ end
class SetupFiberedBase < ActiveSupport::TestCase
def setup
+ ActionView::LookupContext::DetailsKey.clear
+
view_paths = ActionController::Base.view_paths
- view_paths.each(&:clear_cache)
- ActionView::LookupContext.fallbacks.each(&:clear_cache)
@assigns = { secret: "in the sauce", name: nil }
@view = ActionView::Base.with_empty_template_cache.with_view_paths(view_paths, @assigns)