diff options
author | Aaron Patterson <tenderlove@github.com> | 2019-02-06 18:08:36 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-06 18:08:36 -0800 |
commit | 973b62dcddd2db45047d32321e6887c841fc5ccf (patch) | |
tree | 791524f548ebe2b18b4cb7c704962a7a55150e6e /actionview/test/template | |
parent | d0037daa3738ac754781ce5e55778a2cf9d3d2f7 (diff) | |
parent | 570bcdaa65987ac2f5cc84fdf83678cd5c0bb7d8 (diff) | |
download | rails-973b62dcddd2db45047d32321e6887c841fc5ccf.tar.gz rails-973b62dcddd2db45047d32321e6887c841fc5ccf.tar.bz2 rails-973b62dcddd2db45047d32321e6887c841fc5ccf.zip |
Merge pull request #35036 from rails/av-base-subclass
Move compiled ERB to an AV::Base subclass
Diffstat (limited to 'actionview/test/template')
-rw-r--r-- | actionview/test/template/compiled_templates_test.rb | 17 | ||||
-rw-r--r-- | actionview/test/template/log_subscriber_test.rb | 7 | ||||
-rw-r--r-- | actionview/test/template/render_test.rb | 14 | ||||
-rw-r--r-- | actionview/test/template/streaming_render_test.rb | 5 | ||||
-rw-r--r-- | actionview/test/template/template_test.rb | 6 | ||||
-rw-r--r-- | actionview/test/template/translation_helper_test.rb | 5 |
6 files changed, 43 insertions, 11 deletions
diff --git a/actionview/test/template/compiled_templates_test.rb b/actionview/test/template/compiled_templates_test.rb index ded4786e62..6375555bb4 100644 --- a/actionview/test/template/compiled_templates_test.rb +++ b/actionview/test/template/compiled_templates_test.rb @@ -3,7 +3,18 @@ require "abstract_unit" class CompiledTemplatesTest < ActiveSupport::TestCase - teardown do + attr_reader :view_class + + def setup + super + view_paths = ActionController::Base.view_paths + view_paths.each(&:clear_cache) + ActionView::LookupContext.fallbacks.each(&:clear_cache) + @view_class = ActionView::Base.with_empty_template_cache + end + + def teardown + super ActionView::LookupContext::DetailsKey.clear end @@ -72,13 +83,13 @@ class CompiledTemplatesTest < ActiveSupport::TestCase def render_with_cache(*args) view_paths = ActionController::Base.view_paths - ActionView::Base.with_view_paths(view_paths, {}).render(*args) + view_class.with_view_paths(view_paths, {}).render(*args) end def render_without_cache(*args) path = ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH) view_paths = ActionView::PathSet.new([path]) - ActionView::Base.with_view_paths(view_paths, {}).render(*args) + view_class.with_view_paths(view_paths, {}).render(*args) end def modify_template(template, content) diff --git a/actionview/test/template/log_subscriber_test.rb b/actionview/test/template/log_subscriber_test.rb index 9fcf80bb24..4574b798d9 100644 --- a/actionview/test/template/log_subscriber_test.rb +++ b/actionview/test/template/log_subscriber_test.rb @@ -11,10 +11,13 @@ class AVLogSubscriberTest < ActiveSupport::TestCase def setup super - view_paths = ActionController::Base.view_paths + 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) - @view = ActionView::Base.new(renderer, {}) + @view = ActionView::Base.with_empty_template_cache.new(renderer, {}) ActionView::LogSubscriber.attach_to :action_view diff --git a/actionview/test/template/render_test.rb b/actionview/test/template/render_test.rb index f89d087c34..b8d8717db4 100644 --- a/actionview/test/template/render_test.rb +++ b/actionview/test/template/render_test.rb @@ -9,7 +9,8 @@ end module RenderTestCases def setup_view(paths) @assigns = { secret: "in the sauce" } - @view = Class.new(ActionView::Base) do + + @view = Class.new(ActionView::Base.with_empty_template_cache) do def view_cache_dependencies; []; end def combined_fragment_cache_key(key) @@ -17,7 +18,9 @@ module RenderTestCases end end.with_view_paths(paths, @assigns) - @controller_view = TestController.new.view_context + controller = TestController.new + + @controller_view = controller.view_context_class.with_empty_template_cache.new(controller.view_renderer, controller.view_assigns, controller) # Reload and register danish language for testing I18n.backend.store_translations "da", {} @@ -629,6 +632,8 @@ class CachedViewRenderTest < ActiveSupport::TestCase # Ensure view path cache is primed def setup 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 @@ -645,6 +650,9 @@ class LazyViewRenderTest < ActiveSupport::TestCase # Test the same thing as above, but make sure the view path # is not eager loaded def setup + 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 @@ -704,6 +712,8 @@ class CachedCollectionViewRenderTest < ActiveSupport::TestCase setup do 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 dda2095013..4567ee31b4 100644 --- a/actionview/test/template/streaming_render_test.rb +++ b/actionview/test/template/streaming_render_test.rb @@ -8,8 +8,11 @@ end class SetupFiberedBase < ActiveSupport::TestCase def setup 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_view_paths(view_paths, @assigns) + @view = ActionView::Base.with_empty_template_cache.with_view_paths(view_paths, @assigns) @controller_view = TestController.new.view_context end diff --git a/actionview/test/template/template_test.rb b/actionview/test/template/template_test.rb index 8257d97b7c..a069c8f2d0 100644 --- a/actionview/test/template/template_test.rb +++ b/actionview/test/template/template_test.rb @@ -19,7 +19,8 @@ class TestERBTemplate < ActiveSupport::TestCase end class Context < ActionView::Base - def initialize + def initialize(*) + super @output_buffer = "original" @virtual_path = nil end @@ -63,7 +64,8 @@ class TestERBTemplate < ActiveSupport::TestCase end def setup - @context = Context.new + @context = Context.with_empty_template_cache.empty + super end def test_basic_template diff --git a/actionview/test/template/translation_helper_test.rb b/actionview/test/template/translation_helper_test.rb index d04e68e182..23fc9850c4 100644 --- a/actionview/test/template/translation_helper_test.rb +++ b/actionview/test/template/translation_helper_test.rb @@ -36,7 +36,10 @@ class TranslationHelperTest < ActiveSupport::TestCase } } ) - @view = ::ActionView::Base.with_view_paths(ActionController::Base.view_paths, {}) + view_paths = ActionController::Base.view_paths + view_paths.each(&:clear_cache) + ActionView::LookupContext.fallbacks.each(&:clear_cache) + @view = ::ActionView::Base.with_empty_template_cache.with_view_paths(view_paths, {}) end teardown do |