1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Remove redundant test setups in log_subscriber_test

Because controllers' `perform_caching` config is `true` by default, it
means we actually enable the caching in all those tests implicitly (and
it works). Which also means we can avoid repeatedly declaring that and
just specify it once in the setup method (just for declaration).
This commit is contained in:
st0012 2019-04-24 02:02:09 +08:00
parent 6a4eb3e75e
commit fb524896c4

View file

@ -98,6 +98,7 @@ class ACLogSubscriberTest < ActionController::TestCase
@cache_path = Dir.mktmpdir(%w[tmp cache]) @cache_path = Dir.mktmpdir(%w[tmp cache])
@controller.cache_store = :file_store, @cache_path @controller.cache_store = :file_store, @cache_path
@controller.config.perform_caching = true
ActionController::LogSubscriber.attach_to :action_controller ActionController::LogSubscriber.attach_to :action_controller
end end
@ -249,19 +250,15 @@ class ACLogSubscriberTest < ActionController::TestCase
end end
def test_with_fragment_cache def test_with_fragment_cache
@controller.config.perform_caching = true
get :with_fragment_cache get :with_fragment_cache
wait wait
assert_equal 4, logs.size assert_equal 4, logs.size
assert_match(/Read fragment views\/foo/, logs[1]) assert_match(/Read fragment views\/foo/, logs[1])
assert_match(/Write fragment views\/foo/, logs[2]) assert_match(/Write fragment views\/foo/, logs[2])
ensure
@controller.config.perform_caching = true
end end
def test_with_fragment_cache_when_log_disabled def test_with_fragment_cache_when_log_disabled
@controller.config.perform_caching = true
ActionController::Base.enable_fragment_cache_logging = false ActionController::Base.enable_fragment_cache_logging = false
get :with_fragment_cache get :with_fragment_cache
wait wait
@ -269,69 +266,52 @@ class ACLogSubscriberTest < ActionController::TestCase
assert_equal 2, logs.size assert_equal 2, logs.size
assert_equal "Processing by Another::LogSubscribersController#with_fragment_cache as HTML", logs[0] assert_equal "Processing by Another::LogSubscribersController#with_fragment_cache as HTML", logs[0]
assert_match(/Completed 200 OK in \d+ms/, logs[1]) assert_match(/Completed 200 OK in \d+ms/, logs[1])
ensure
@controller.config.perform_caching = true
ActionController::Base.enable_fragment_cache_logging = true ActionController::Base.enable_fragment_cache_logging = true
end end
def test_with_fragment_cache_if_with_true def test_with_fragment_cache_if_with_true
@controller.config.perform_caching = true
get :with_fragment_cache_if_with_true_condition get :with_fragment_cache_if_with_true_condition
wait wait
assert_equal 4, logs.size assert_equal 4, logs.size
assert_match(/Read fragment views\/foo/, logs[1]) assert_match(/Read fragment views\/foo/, logs[1])
assert_match(/Write fragment views\/foo/, logs[2]) assert_match(/Write fragment views\/foo/, logs[2])
ensure
@controller.config.perform_caching = true
end end
def test_with_fragment_cache_if_with_false def test_with_fragment_cache_if_with_false
@controller.config.perform_caching = true
get :with_fragment_cache_if_with_false_condition get :with_fragment_cache_if_with_false_condition
wait wait
assert_equal 2, logs.size assert_equal 2, logs.size
assert_no_match(/Read fragment views\/foo/, logs[1]) assert_no_match(/Read fragment views\/foo/, logs[1])
assert_no_match(/Write fragment views\/foo/, logs[2]) assert_no_match(/Write fragment views\/foo/, logs[2])
ensure
@controller.config.perform_caching = true
end end
def test_with_fragment_cache_unless_with_true def test_with_fragment_cache_unless_with_true
@controller.config.perform_caching = true
get :with_fragment_cache_unless_with_true_condition get :with_fragment_cache_unless_with_true_condition
wait wait
assert_equal 2, logs.size assert_equal 2, logs.size
assert_no_match(/Read fragment views\/foo/, logs[1]) assert_no_match(/Read fragment views\/foo/, logs[1])
assert_no_match(/Write fragment views\/foo/, logs[2]) assert_no_match(/Write fragment views\/foo/, logs[2])
ensure
@controller.config.perform_caching = true
end end
def test_with_fragment_cache_unless_with_false def test_with_fragment_cache_unless_with_false
@controller.config.perform_caching = true
get :with_fragment_cache_unless_with_false_condition get :with_fragment_cache_unless_with_false_condition
wait wait
assert_equal 4, logs.size assert_equal 4, logs.size
assert_match(/Read fragment views\/foo/, logs[1]) assert_match(/Read fragment views\/foo/, logs[1])
assert_match(/Write fragment views\/foo/, logs[2]) assert_match(/Write fragment views\/foo/, logs[2])
ensure
@controller.config.perform_caching = true
end end
def test_with_fragment_cache_and_percent_in_key def test_with_fragment_cache_and_percent_in_key
@controller.config.perform_caching = true
get :with_fragment_cache_and_percent_in_key get :with_fragment_cache_and_percent_in_key
wait wait
assert_equal 4, logs.size assert_equal 4, logs.size
assert_match(/Read fragment views\/foo/, logs[1]) assert_match(/Read fragment views\/foo/, logs[1])
assert_match(/Write fragment views\/foo/, logs[2]) assert_match(/Write fragment views\/foo/, logs[2])
ensure
@controller.config.perform_caching = true
end end
def test_process_action_with_exception_includes_http_status_code def test_process_action_with_exception_includes_http_status_code