squelching more warnings in the AR tests. [#4218 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>

3 files changed, 39 insertions, 13 deletions

diff --git a/activerecord/test/cases/callbacks_test.rb b/activerecord/test/cases/callbacks_test.rb
index ff2322ac15..58194993f2 100644
--- a/activerecord/test/cases/callbacks_test.rb
+++ b/activerecord/test/cases/callbacks_test.rb
@@ -139,7 +139,7 @@ class CallbackCancellationDeveloper < ActiveRecord::Base
   attr_reader   :after_save_called, :after_create_called, :after_update_called, :after_destroy_called
   attr_accessor :cancel_before_save, :cancel_before_create, :cancel_before_update, :cancel_before_destroy
 
-  before_save    { !@cancel_before_save    }
+  before_save    {defined?(@cancel_before_save) ? !@cancel_before_save : false}
   before_create  { !@cancel_before_create  }
   before_update  { !@cancel_before_update  }
   before_destroy { !@cancel_before_destroy }
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index f965652a9a..e78b522b65 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -244,14 +244,14 @@ class FixturesWithoutInstantiationTest < ActiveRecord::TestCase
   fixtures :topics, :developers, :accounts
 
   def test_without_complete_instantiation
-    assert_nil @first
-    assert_nil @topics
-    assert_nil @developers
-    assert_nil @accounts
+    assert !defined?(@first)
+    assert !defined?(@topics)
+    assert !defined?(@developers)
+    assert !defined?(@accounts)
   end
 
   def test_fixtures_from_root_yml_without_instantiation
-    assert_nil @unknown
+    assert !defined?(@unknown), "@unknown is not defined"
   end
 
   def test_accessor_methods
@@ -279,7 +279,7 @@ class FixturesWithoutInstanceInstantiationTest < ActiveRecord::TestCase
   fixtures :topics, :developers, :accounts
 
   def test_without_instance_instantiation
-    assert_nil @first
+    assert !defined?(@first), "@first is not defined"
     assert_not_nil @topics
     assert_not_nil @developers
     assert_not_nil @accounts
diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index aca70b4238..c550030329 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -51,6 +51,7 @@ class TransactionTest < ActiveRecord::TestCase
     assert !Topic.find(2).approved?, "Second should have been unapproved"
   ensure
     class << Topic.connection
+      remove_method :commit_db_transaction
       alias :commit_db_transaction :real_commit_db_transaction rescue nil
     end
   end
@@ -382,28 +383,53 @@ class TransactionTest < ActiveRecord::TestCase
 
   private
     def add_exception_raising_after_save_callback_to_topic
-      Topic.class_eval "def after_save_for_transaction; raise 'Make the transaction rollback' end"
+      Topic.class_eval <<-eoruby, __FILE__, __LINE__ + 1
+        remove_method(:after_save_for_transaction)
+        def after_save_for_transaction
+          raise 'Make the transaction rollback'
+        end
+      eoruby
     end
 
     def remove_exception_raising_after_save_callback_to_topic
-      Topic.class_eval "def after_save_for_transaction; end"
+      Topic.class_eval <<-eoruby, __FILE__, __LINE__ + 1
+        remove_method :after_save_for_transaction
+        def after_save_for_transaction; end
+      eoruby
     end
 
     def add_exception_raising_after_create_callback_to_topic
-      Topic.class_eval "def after_create_for_transaction; raise 'Make the transaction rollback' end"
+      Topic.class_eval <<-eoruby, __FILE__, __LINE__ + 1
+        remove_method(:after_create_for_transaction)
+        def after_create_for_transaction
+          raise 'Make the transaction rollback'
+        end
+      eoruby
     end
 
     def remove_exception_raising_after_create_callback_to_topic
-      Topic.class_eval "def after_create_for_transaction; end"
+      Topic.class_eval <<-eoruby, __FILE__, __LINE__ + 1
+        remove_method :after_create_for_transaction
+        def after_create_for_transaction; end
+      eoruby
     end
 
     %w(validation save destroy).each do |filter|
       define_method("add_cancelling_before_#{filter}_with_db_side_effect_to_topic") do
-        Topic.class_eval "def before_#{filter}_for_transaction() Book.create; false end"
+        Topic.class_eval <<-eoruby, __FILE__, __LINE__ + 1
+          remove_method :before_#{filter}_for_transaction
+          def before_#{filter}_for_transaction
+            Book.create
+            false
+          end
+        eoruby
       end
 
       define_method("remove_cancelling_before_#{filter}_with_db_side_effect_to_topic") do
-        Topic.class_eval "def before_#{filter}_for_transaction; end"
+        Topic.class_eval <<-eoruby, __FILE__, __LINE__ + 1
+          remove_method :before_#{filter}_for_transaction
+          def before_#{filter}_for_transaction; end
+        eoruby
       end
     end
 end