aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/caching_test.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-12-01 14:53:39 -0600
committerJoshua Peek <josh@joshpeek.com>2009-12-01 14:53:39 -0600
commit44587b7faeb2bf2962e9a2e824c341ff1e3f9add (patch)
tree9a97a90bffca68ab8e0f13003e4590ca9f1a93a2 /actionpack/test/controller/caching_test.rb
parent61a31f3d3dae55b3ed2a49fafcbfe45b77ea3be2 (diff)
parent0c4990b5f4b8c99ea656170eff9bb9c3490de642 (diff)
downloadrails-44587b7faeb2bf2962e9a2e824c341ff1e3f9add.tar.gz
rails-44587b7faeb2bf2962e9a2e824c341ff1e3f9add.tar.bz2
rails-44587b7faeb2bf2962e9a2e824c341ff1e3f9add.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/test/controller/caching_test.rb')
-rw-r--r--actionpack/test/controller/caching_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 54de920740..682a8f3995 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -640,6 +640,7 @@ class FragmentCachingTest < ActionController::TestCase
assert fragment_computed
assert_equal 'generated till now -> ', buffer
+ ActiveSupport::Notifications.notifier.wait
assert_equal [:fragment_exist?, :write_fragment], events.map(&:first)
end