Simplify repair_validations on AR and make it work with new callbacks.

1 files changed, 14 insertions, 14 deletions

diff --git a/activerecord/test/cases/validations_test.rb b/activerecord/test/cases/validations_test.rb
index 7462d944e0..3a1d5ae212 100644
--- a/activerecord/test/cases/validations_test.rb
+++ b/activerecord/test/cases/validations_test.rb
@@ -42,7 +42,7 @@ class ValidationsTest < ActiveRecord::TestCase
   repair_validations(Topic)
 
   def test_error_on_create
-    r = Reply.new
+    r = WrongReply.new
     r.title = "Wrong Create"
     assert !r.valid?
     assert r.errors[:title].any?, "A reply with a bad title should mark that attribute as invalid"
@@ -50,7 +50,7 @@ class ValidationsTest < ActiveRecord::TestCase
   end
 
   def test_error_on_update
-    r = Reply.new
+    r = WrongReply.new
     r.title = "Bad"
     r.content = "Good"
     assert r.save, "First save should be successful"
@@ -63,11 +63,11 @@ class ValidationsTest < ActiveRecord::TestCase
   end
 
   def test_invalid_record_exception
-    assert_raise(ActiveRecord::RecordInvalid) { Reply.create! }
-    assert_raise(ActiveRecord::RecordInvalid) { Reply.new.save! }
+    assert_raise(ActiveRecord::RecordInvalid) { WrongReply.create! }
+    assert_raise(ActiveRecord::RecordInvalid) { WrongReply.new.save! }
 
     begin
-      r = Reply.new
+      r = WrongReply.new
       r.save!
       flunk
     rescue ActiveRecord::RecordInvalid => invalid
@@ -77,13 +77,13 @@ class ValidationsTest < ActiveRecord::TestCase
 
   def test_exception_on_create_bang_many
     assert_raise(ActiveRecord::RecordInvalid) do
-      Reply.create!([ { "title" => "OK" }, { "title" => "Wrong Create" }])
+      WrongReply.create!([ { "title" => "OK" }, { "title" => "Wrong Create" }])
     end
   end
 
   def test_exception_on_create_bang_with_block
     assert_raise(ActiveRecord::RecordInvalid) do
-      Reply.create!({ "title" => "OK" }) do |r|
+      WrongReply.create!({ "title" => "OK" }) do |r|
         r.content = nil
       end
     end
@@ -91,15 +91,15 @@ class ValidationsTest < ActiveRecord::TestCase
 
   def test_exception_on_create_bang_many_with_block
     assert_raise(ActiveRecord::RecordInvalid) do
-      Reply.create!([{ "title" => "OK" }, { "title" => "Wrong Create" }]) do |r|
+      WrongReply.create!([{ "title" => "OK" }, { "title" => "Wrong Create" }]) do |r|
         r.content = nil
       end
     end
   end
 
   def test_scoped_create_without_attributes
-    Reply.send(:with_scope, :create => {}) do
-      assert_raise(ActiveRecord::RecordInvalid) { Reply.create! }
+    WrongReply.send(:with_scope, :create => {}) do
+      assert_raise(ActiveRecord::RecordInvalid) { WrongReply.create! }
     end
   end
 
@@ -122,15 +122,15 @@ class ValidationsTest < ActiveRecord::TestCase
   end
 
   def test_create_without_validation
-    reply = Reply.new
+    reply = WrongReply.new
     assert !reply.save
     assert reply.save(false)
   end
 
   def test_create_without_validation_bang
-    count = Reply.count
-    assert_nothing_raised { Reply.new.save_without_validation! }
-    assert count+1, Reply.count
+    count = WrongReply.count
+    assert_nothing_raised { WrongReply.new.save_without_validation! }
+    assert count+1, WrongReply.count
   end
 
   def test_validates_acceptance_of_with_non_existant_table