aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorChristos Trochalakis <yatiohi@ideopolis.gr>2010-09-16 19:44:18 +0300
committerAaron Patterson <aaron.patterson@gmail.com>2011-01-18 09:52:11 -0800
commit7dab186fded971e69f9d8bf5db524c20da326b83 (patch)
tree4d28f7fa1e1ab8f86614d056baa0c53bf726ec9f /actionpack/test
parent11fe2161ce8adc39aa69178211f7b661eafb201a (diff)
downloadrails-7dab186fded971e69f9d8bf5db524c20da326b83.tar.gz
rails-7dab186fded971e69f9d8bf5db524c20da326b83.tar.bz2
rails-7dab186fded971e69f9d8bf5db524c20da326b83.zip
Issue one Cache#read command instead of two in the case of a fragment cache hit
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/log_subscriber_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
index e6fe0b1f04..cac0881133 100644
--- a/actionpack/test/controller/log_subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -139,20 +139,20 @@ class ACLogSubscriberTest < ActionController::TestCase
wait
assert_equal 4, logs.size
- assert_match(/Exist fragment\? views\/foo/, logs[1])
+ assert_match /Read fragment views\/foo/, logs[1]
assert_match(/Write fragment views\/foo/, logs[2])
ensure
@controller.config.perform_caching = true
end
-
+
def test_with_fragment_cache_and_percent_in_key
@controller.config.perform_caching = true
get :with_fragment_cache_and_percent_in_key
wait
assert_equal 4, logs.size
- assert_match(/Exist fragment\? views\/foo%bar/, logs[1])
- assert_match(/Write fragment views\/foo%bar/, logs[2])
+ assert_match /Read fragment views\/foo/, logs[1]
+ assert_match /Write fragment views\/foo/, logs[2]
ensure
@controller.config.perform_caching = true
end