diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-05-04 19:36:26 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-05-04 19:36:26 +0200 |
| commit | 583b60d109522907020700225f1c739737297a2d (patch) | |
| tree | a36d986cbbb73c94d217cbe86c9af7ef97a89567 /activesupport/test/notifications_test.rb | |
| parent | 44a98967676492995d19fd4d541dbc9d52bf6b53 (diff) | |
| parent | 0dd3b4630fea4bd4d4010b7096c9ee79d34c4501 (diff) | |
| download | rails-583b60d109522907020700225f1c739737297a2d.tar.gz rails-583b60d109522907020700225f1c739737297a2d.tar.bz2 rails-583b60d109522907020700225f1c739737297a2d.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'activesupport/test/notifications_test.rb')
| -rw-r--r-- | activesupport/test/notifications_test.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activesupport/test/notifications_test.rb b/activesupport/test/notifications_test.rb index c2e1c588f0..e11de5f67a 100644 --- a/activesupport/test/notifications_test.rb +++ b/activesupport/test/notifications_test.rb @@ -168,7 +168,7 @@ module Notifications assert_equal Hash[:payload => "notifications"], @events.last.payload end - def test_instrument_does_not_publish_when_exception_is_raised + def test_instrument_publishes_when_exception_is_raised begin instrument(:awesome, :payload => "notifications") do raise "FAIL" @@ -178,7 +178,9 @@ module Notifications end drain - assert_equal 0, @events.size + assert_equal 1, @events.size + assert_equal Hash[:payload => "notifications", + :exception => ["RuntimeError", "FAIL"]], @events.last.payload end def test_event_is_pushed_even_without_block |