diff options
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r-- | actionpack/test/controller/caching_test.rb | 2 | ||||
-rw-r--r-- | actionpack/test/controller/logging_test.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb index 54d1a72f1f..5a8dc0c358 100644 --- a/actionpack/test/controller/caching_test.rb +++ b/actionpack/test/controller/caching_test.rb @@ -630,6 +630,8 @@ class FragmentCachingTest < ActionController::TestCase end def test_fragment_for_logging + # Wait pending notifications to be published + ActiveSupport::Notifications.notifier.wait @controller.logger = MockLogger.new fragment_computed = false diff --git a/actionpack/test/controller/logging_test.rb b/actionpack/test/controller/logging_test.rb index 6b9db88d83..594cf17312 100644 --- a/actionpack/test/controller/logging_test.rb +++ b/actionpack/test/controller/logging_test.rb @@ -19,6 +19,7 @@ class LoggingTest < ActionController::TestCase def setup super + wait # Wait pending notifications to be published set_logger end |