From 6530fe6a251d4a4b32f876048dde1d846cfe4a17 Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Sun, 7 Aug 2016 19:18:15 +0200 Subject: Extract common view cache dependency setup. --- actionview/test/template/log_subscriber_test.rb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'actionview/test/template/log_subscriber_test.rb') diff --git a/actionview/test/template/log_subscriber_test.rb b/actionview/test/template/log_subscriber_test.rb index 3884807017..ece059484c 100644 --- a/actionview/test/template/log_subscriber_test.rb +++ b/actionview/test/template/log_subscriber_test.rb @@ -37,6 +37,11 @@ class AVLogSubscriberTest < ActiveSupport::TestCase @view.controller = controller end + def set_view_cache_dependencies + def @view.view_cache_dependencies; []; end + def @view.fragment_cache_key(*); "ahoy `controller` dependency"; end + end + def test_render_file_template Rails.stub(:root, File.expand_path(FIXTURE_LOAD_PATH)) do @view.render(file: "test/hello_world") @@ -82,8 +87,7 @@ class AVLogSubscriberTest < ActiveSupport::TestCase def test_render_partial_with_cache_missed Rails.stub(:root, File.expand_path(FIXTURE_LOAD_PATH)) do - def @view.view_cache_dependencies; []; end - def @view.fragment_cache_key(*); 'ahoy `controller` dependency'; end + set_view_cache_dependencies set_cache_controller @view.render(partial: "test/cached_customer", locals: { cached_customer: Customer.new("david") }) @@ -96,8 +100,7 @@ class AVLogSubscriberTest < ActiveSupport::TestCase def test_render_partial_with_cache_hitted Rails.stub(:root, File.expand_path(FIXTURE_LOAD_PATH)) do - def @view.view_cache_dependencies; []; end - def @view.fragment_cache_key(*); 'ahoy `controller` dependency'; end + set_view_cache_dependencies set_cache_controller @view.render(partial: "test/cached_customer", locals: { cached_customer: Customer.new("david") }) @@ -112,8 +115,7 @@ class AVLogSubscriberTest < ActiveSupport::TestCase def test_render_partial_with_cache_hitted_and_missed Rails.stub(:root, File.expand_path(FIXTURE_LOAD_PATH)) do - def @view.view_cache_dependencies; []; end - def @view.fragment_cache_key(*); 'ahoy `controller` dependency'; end + set_view_cache_dependencies set_cache_controller @view.render(partial: "test/cached_customer", locals: { cached_customer: Customer.new("david") }) @@ -162,8 +164,7 @@ class AVLogSubscriberTest < ActiveSupport::TestCase def test_render_collection_with_cached_set Rails.stub(:root, File.expand_path(FIXTURE_LOAD_PATH)) do - def @view.view_cache_dependencies; []; end - def @view.fragment_cache_key(*); "ahoy `controller` dependency"; end + set_view_cache_dependencies @view.render(partial: "customers/customer", collection: [ Customer.new("david"), Customer.new("mary") ], cached: true, locals: { greeting: "hi" }) -- cgit v1.2.3