aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorRecursive Madman <recursive.madman@gmx.de>2014-11-19 12:34:25 +0100
committerRecursive Madman <recursive.madman@gmx.de>2014-11-26 14:41:49 +0100
commit3e30c5d4222f816cdffd5241d56ef9442f6d1903 (patch)
treea86bf99ed5f5fa12f127d17588bf3ffa92116de2 /activerecord/test/cases
parent644696e2ac04099623a0425016470cc5485e067b (diff)
downloadrails-3e30c5d4222f816cdffd5241d56ef9442f6d1903.tar.gz
rails-3e30c5d4222f816cdffd5241d56ef9442f6d1903.tar.bz2
rails-3e30c5d4222f816cdffd5241d56ef9442f6d1903.zip
Add #record attribute to RecordNotFound and RecordDestroyed exceptions.
This allows these exceptions to be handled generically in conjunction with RecordInvalid.
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/callbacks_test.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/test/cases/callbacks_test.rb b/activerecord/test/cases/callbacks_test.rb
index 5e07f8a03c..e3c3c2fcdf 100644
--- a/activerecord/test/cases/callbacks_test.rb
+++ b/activerecord/test/cases/callbacks_test.rb
@@ -443,7 +443,8 @@ class CallbacksTest < ActiveRecord::TestCase
david = ImmutableDeveloper.find(1)
assert david.valid?
assert !david.save
- assert_raise(ActiveRecord::RecordNotSaved) { david.save! }
+ exc = assert_raise(ActiveRecord::RecordNotSaved) { david.save! }
+ assert_equal exc.record, david
david = ImmutableDeveloper.find(1)
david.salary = 10_000_000
@@ -477,7 +478,8 @@ class CallbacksTest < ActiveRecord::TestCase
def test_before_destroy_returning_false
david = ImmutableDeveloper.find(1)
assert !david.destroy
- assert_raise(ActiveRecord::RecordNotDestroyed) { david.destroy! }
+ exc = assert_raise(ActiveRecord::RecordNotDestroyed) { david.destroy! }
+ assert_equal exc.record, david
assert_not_nil ImmutableDeveloper.find_by_id(1)
someone = CallbackCancellationDeveloper.find(1)