aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/activerecord
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-03 23:39:09 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-03 23:39:09 +0100
commitf2d276fefdd620f18bb9fe3524ae9db6da70621d (patch)
treebb02c8fc29f304dfd53beec88dd6d28c322b008d /actionpack/test/activerecord
parent53c6984944b03b5de036167a418593dfcd12e886 (diff)
downloadrails-f2d276fefdd620f18bb9fe3524ae9db6da70621d.tar.gz
rails-f2d276fefdd620f18bb9fe3524ae9db6da70621d.tar.bz2
rails-f2d276fefdd620f18bb9fe3524ae9db6da70621d.zip
Ensure no notification is on the queue before running notifications related tests.
Diffstat (limited to 'actionpack/test/activerecord')
-rw-r--r--actionpack/test/activerecord/controller_runtime_test.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/test/activerecord/controller_runtime_test.rb b/actionpack/test/activerecord/controller_runtime_test.rb
index 6f30bec8ee..9525dd8307 100644
--- a/actionpack/test/activerecord/controller_runtime_test.rb
+++ b/actionpack/test/activerecord/controller_runtime_test.rb
@@ -23,6 +23,8 @@ class ARLoggingTest < ActionController::TestCase
end
def test_log_with_active_record
+ # Wait pending notifications to be published
+ wait
get :show
wait
assert_match /ActiveRecord runtime/, @controller.logger.logged[3]