aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-03-16 11:43:04 -0700
committerCarlhuda <carlhuda@engineyard.com>2010-03-16 11:43:04 -0700
commitc61ed70b00c93bdf42c7538a334f07e58c60bc4e (patch)
treeaaa304345983bafd88b1860b5bf63da1271e690e /actionpack/test
parent67d8b9743add53f908ca417c641c4a54dd326c7d (diff)
downloadrails-c61ed70b00c93bdf42c7538a334f07e58c60bc4e.tar.gz
rails-c61ed70b00c93bdf42c7538a334f07e58c60bc4e.tar.bz2
rails-c61ed70b00c93bdf42c7538a334f07e58c60bc4e.zip
Some more tweaks on <% %>.
* The cache helper is now semantically "mark this region for caching" * As a result, <% x = cache do %> no longer works
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/caching_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 2f9cc44308..f6264c0954 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -704,8 +704,8 @@ CACHED
def test_fragment_caching_in_partials
get :html_fragment_cached_with_partial
assert_response :success
- assert_match /Fragment caching in a partial/, @response.body
- assert_match "Fragment caching in a partial", @store.read('views/test.host/functional_caching/html_fragment_cached_with_partial')
+ assert_match /Old fragment caching in a partial/, @response.body
+ assert_match "Old fragment caching in a partial", @store.read('views/test.host/functional_caching/html_fragment_cached_with_partial')
end
def test_render_inline_before_fragment_caching
@@ -719,8 +719,8 @@ CACHED
def test_fragment_caching_in_rjs_partials
xhr :get, :js_fragment_cached_with_partial
assert_response :success
- assert_match /Fragment caching in a partial/, @response.body
- assert_match "Fragment caching in a partial", @store.read('views/test.host/functional_caching/js_fragment_cached_with_partial')
+ assert_match /Old fragment caching in a partial/, @response.body
+ assert_match "Old fragment caching in a partial", @store.read('views/test.host/functional_caching/js_fragment_cached_with_partial')
end
def test_html_formatted_fragment_caching