Fix warnings in AMo

8 files changed, 10 insertions, 51 deletions

diff --git a/activemodel/Rakefile b/activemodel/Rakefile
index dcd1eaa444..4a64c90dd9 100755
--- a/activemodel/Rakefile
+++ b/activemodel/Rakefile
@@ -15,12 +15,13 @@ Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = Dir.glob("test/cases/**/*_test.rb").sort
   t.verbose = true
+  t.warning = true
 end
 
 task :isolated_test do
   ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
   Dir.glob("test/**/*_test.rb").all? do |file|
-    system(ruby, '-Ilib:test', file)
+    system(ruby, '-w', '-Ilib:test', file)
   end or raise "Failures"
 end
 
diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index 1091ad3095..aa35a2726e 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -181,7 +181,7 @@ module ActiveModel
       end
 
       def attribute_methods_generated?
-        @attribute_methods_generated ? true : false
+        @attribute_methods_generated ||= nil
       end
 
       protected
diff --git a/activemodel/lib/active_model/validations_repair_helper.rb b/activemodel/lib/active_model/validations_repair_helper.rb
index 432e411308..0809e7c0d1 100644
--- a/activemodel/lib/active_model/validations_repair_helper.rb
+++ b/activemodel/lib/active_model/validations_repair_helper.rb
@@ -7,7 +7,8 @@ module ActiveModel
         model_classes.inject({}) do |repair, klass|
           repair[klass] ||= {}
           [:validate, :validate_on_create, :validate_on_update].each do |callback|
-            the_callback = klass.instance_variable_get("@#{callback.to_s}_callbacks")
+            ivar = "@#{callback.to_s}_callbacks"
+            the_callback = klass.instance_variable_get(ivar) if klass.instance_variable_defined?(ivar)
             repair[klass][callback] = (the_callback.nil? ? nil : the_callback.dup)
           end
           repair
diff --git a/activemodel/test/cases/observing_test.rb b/activemodel/test/cases/observing_test.rb
index fbf93c19ef..e23bda0528 100644
--- a/activemodel/test/cases/observing_test.rb
+++ b/activemodel/test/cases/observing_test.rb
@@ -78,6 +78,7 @@ class ObserverTest < ActiveModel::TestCase
 
   def teardown
     FooObserver.instance_eval do
+      undef_method :observed_classes
       alias_method :observed_classes, :original_observed_classes
     end
   end
diff --git a/activemodel/test/cases/serializeration/json_serialization_test.rb b/activemodel/test/cases/serializeration/json_serialization_test.rb
index d4c7c31633..81df52fcb9 100644
--- a/activemodel/test/cases/serializeration/json_serialization_test.rb
+++ b/activemodel/test/cases/serializeration/json_serialization_test.rb
@@ -8,7 +8,7 @@ class Contact
 
   def attributes
     instance_values
-  end
+  end unless method_defined?(:attributes)
 end
 
 class JsonSerializationTest < ActiveModel::TestCase
diff --git a/activemodel/test/cases/serializeration/xml_serialization_test.rb b/activemodel/test/cases/serializeration/xml_serialization_test.rb
index 7212719c2d..6340aad531 100644
--- a/activemodel/test/cases/serializeration/xml_serialization_test.rb
+++ b/activemodel/test/cases/serializeration/xml_serialization_test.rb
@@ -8,7 +8,7 @@ class Contact
 
   def attributes
     instance_values
-  end
+  end unless method_defined?(:attributes)
 end
 
 module Admin
diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb
index cc68d847a2..544b680b4b 100644
--- a/activemodel/test/cases/validations/i18n_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_validation_test.rb
@@ -107,32 +107,6 @@ class I18nValidationTest < ActiveModel::TestCase
     @person.valid?
   end
 
-  def test_validates_length_of_within_generates_message_with_title_too_short
-    Person.validates_length_of :title, :within => 3..5
-    @person.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => nil})
-    @person.valid?
-  end
-
-  def test_validates_length_of_within_generates_message_with_title_too_short_and_custom_default_message
-    Person.validates_length_of :title, :within => 3..5, :too_short => 'custom'
-    @person.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => 'custom'})
-    @person.valid?
-  end
-
-  def test_validates_length_of_within_generates_message_with_title_too_long
-    Person.validates_length_of :title, :within => 3..5
-    @person.title = 'this title is too long'
-    @person.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => nil})
-    @person.valid?
-  end
-
-  def test_validates_length_of_within_generates_message_with_title_too_long_and_custom_default_message
-    Person.validates_length_of :title, :within => 3..5, :too_long => 'custom'
-    @person.title = 'this title is too long'
-    @person.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => 'custom'})
-    @person.valid?
-  end
-
   # validates_length_of :within w/ mocha
 
   def test_validates_length_of_within_generates_message_with_title_too_short
@@ -280,7 +254,7 @@ class I18nValidationTest < ActiveModel::TestCase
     @person.valid?
   end
 
-  def test_validates_numericality_of_odd_generates_message_with_custom_default_message
+  def test_validates_numericality_of_less_than_odd_generates_message_with_custom_default_message
     Person.validates_numericality_of :title, :only_integer => true, :less_than => 0, :message => 'custom'
     @person.title = 1
     @person.errors.expects(:generate_message).with(:title, :less_than, {:value => 1, :count => 0, :default => 'custom'})
@@ -384,24 +358,6 @@ class I18nValidationTest < ActiveModel::TestCase
     assert_equal ['global message'], @person.errors[:title]
   end
 
-  def test_validates_length_of_is_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en', :activemodel => {:errors => {:models => {:person => {:attributes => {:title => {:wrong_length => 'custom message'}}}}}}
-    I18n.backend.store_translations 'en', :activemodel => {:errors => {:messages => {:wrong_length => 'global message'}}}
-
-    Person.validates_length_of :title, :is => 5
-    @person.valid?
-    assert_equal ['custom message'], @person.errors[:title]
-  end
-
-  def test_validates_length_of_is_finds_global_default_translation
-    I18n.backend.store_translations 'en', :activemodel => {:errors => {:messages => {:wrong_length => 'global message'}}}
-
-    Person.validates_length_of :title, :is => 5
-    @person.valid?
-    assert_equal ['global message'], @person.errors[:title]
-  end
-
-
   # validates_format_of w/o mocha
 
   def test_validates_format_of_finds_custom_model_key_translation
diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb
index 4a2ec5bf95..dd509b6c6a 100644
--- a/activerecord/lib/active_record/callbacks.rb
+++ b/activerecord/lib/active_record/callbacks.rb
@@ -227,7 +227,7 @@ module ActiveRecord
       end
 
       include ActiveSupport::Callbacks
-      define_callbacks *CALLBACKS
+      define_callbacks(*CALLBACKS)
     end
 
     # Is called when the object was instantiated by one of the finders, like <tt>Base.find</tt>.