aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-26 11:54:15 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-26 11:54:15 -0200
commitcb23d6a5ee34f6f7de15174cbd7b2920d6f4c956 (patch)
tree02ed837134c62ca5f0087ce4ed3942f5683613ba /activerecord/test
parent1a35f907a975f352bd1a90bfc116415249c49393 (diff)
parent3e30c5d4222f816cdffd5241d56ef9442f6d1903 (diff)
downloadrails-cb23d6a5ee34f6f7de15174cbd7b2920d6f4c956.tar.gz
rails-cb23d6a5ee34f6f7de15174cbd7b2920d6f4c956.tar.bz2
rails-cb23d6a5ee34f6f7de15174cbd7b2920d6f4c956.zip
Merge pull request #17674 from recursive-madman/activerecord-error-improvement
Add #record attribute to RecordNotFound and RecordDestroyed exceptions.
Diffstat (limited to 'activerecord/test')
-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)