diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-02-01 23:42:38 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-02-01 23:42:38 +0000 |
| commit | fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3 (patch) | |
| tree | 347f771202054a443f9df23a8f65f91d49a52209 /activesupport/test/notifications_test.rb | |
| parent | 27fa38cc3e162b2f8c4bb2d50130fbc17bad6039 (diff) | |
| parent | 16c0d1d3b6089bb4b0b0baf7c3eeb5949f31f02b (diff) | |
| download | rails-fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3.tar.gz rails-fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3.tar.bz2 rails-fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3.zip | |
Merge remote branch 'mainstream/master'
Diffstat (limited to 'activesupport/test/notifications_test.rb')
| -rw-r--r-- | activesupport/test/notifications_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/test/notifications_test.rb b/activesupport/test/notifications_test.rb index d3af535c26..0b78b53c73 100644 --- a/activesupport/test/notifications_test.rb +++ b/activesupport/test/notifications_test.rb @@ -77,7 +77,7 @@ module Notifications def test_instrument_with_bang_returns_result_even_on_failure begin instrument!(:awesome, :payload => "notifications") do - raise "OMG" + raise "FAIL" end flunk rescue @@ -126,10 +126,10 @@ module Notifications def test_instrument_does_not_publish_when_exception_is_raised begin instrument(:awesome, :payload => "notifications") do - raise "OMG" + raise "FAIL" end rescue RuntimeError => e - assert_equal "OMG", e.message + assert_equal "FAIL", e.message end drain |