Fixed that Base.save should always return false if the save didn't succeed, including if it has halted by before_save's (closes #1861, #2477) [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3707 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 5 insertions, 23 deletions

diff --git a/activerecord/test/callbacks_test.rb b/activerecord/test/callbacks_test.rb
index c1639c1795..3a4dac90cf 100644
--- a/activerecord/test/callbacks_test.rb
+++ b/activerecord/test/callbacks_test.rb
@@ -324,39 +324,21 @@ class CallbacksTest < Test::Unit::TestCase
   def test_before_save_returning_false
     david = ImmutableDeveloper.find(1)
     assert david.valid?
-    assert david.save
-    assert david.cancelled?
-
-    david = ImmutableDeveloper.find(1)
-    david.salary = 10_000_000
-    assert !david.valid?
     assert !david.save
-    assert !david.cancelled?
-
-    david = ImmutableMethodDeveloper.find(1)
-    assert david.valid?
-    assert david.save
-    assert david.cancelled?
+    assert_raises(ActiveRecord::RecordNotSaved) { david.save! }
 
-    david = ImmutableMethodDeveloper.find(1)
+    david = ImmutableDeveloper.find(1)
     david.salary = 10_000_000
     assert !david.valid?
     assert !david.save
-    assert !david.cancelled?
+    assert_raises(ActiveRecord::RecordInvalid) { david.save! }
   end
 
   def test_before_destroy_returning_false
     david = ImmutableDeveloper.find(1)
-    david.destroy
-    assert david.cancelled?
+    assert !david.destroy
     assert_not_nil ImmutableDeveloper.find_by_id(1)
-
-    david = ImmutableMethodDeveloper.find(1)
-    david.destroy
-    assert david.cancelled?
-    assert_not_nil ImmutableMethodDeveloper.find_by_id(1)
-  end
-
+  end  
 
   def test_zzz_callback_returning_false # must be run last since we modify CallbackDeveloper
     david = CallbackDeveloper.find(1)