Merge commit 'rails/master'

Conflicts:
	activerecord/lib/active_record/associations.rb

2 files changed, 68 insertions, 0 deletions

diff --git a/activemodel/test/cases/lint_test.rb b/activemodel/test/cases/lint_test.rb
new file mode 100644
index 0000000000..165c353045
--- /dev/null
+++ b/activemodel/test/cases/lint_test.rb
@@ -0,0 +1,50 @@
+require "cases/helper"
+
+class TestLint < Test::Unit::TestCase
+  class CompliantObject
+    def to_model
+      self
+    end
+    
+    def valid?()      true end
+    def new_record?() true end
+    def destroyed?()  true end
+    
+    def errors
+      obj = Object.new
+      def obj.[](key)         [] end
+      def obj.full_messages() [] end
+      obj
+    end
+  end
+  
+  def assert_output(object, failures, errors, *test_names)
+    ActiveModel::Lint.test(object, 3, output = StringIO.new)
+    regex =  %r{#{failures} failures, #{errors} errors}
+    assert_match regex, output.string
+    
+    test_names.each do |test_name|
+      assert_match test_name, output.string
+    end
+  end
+  
+  def test_valid
+    assert_output(CompliantObject.new, 0, 0, /test_valid/)
+  end
+  
+  def test_new_record
+    assert_output(CompliantObject.new, 0, 0, /test_new_record?/)
+  end
+  
+  def test_destroyed
+    assert_output(CompliantObject.new, 0, 0, /test_destroyed/)
+  end
+  
+  def test_errors_aref
+    assert_output(CompliantObject.new, 0, 0, /test_errors_aref/)
+  end
+
+  def test_errors_full_messages
+    assert_output(CompliantObject.new, 0, 0, /test_errors_aref/)
+  end
+end
\ No newline at end of file
diff --git a/activemodel/test/cases/validations/numericality_validation_test.rb b/activemodel/test/cases/validations/numericality_validation_test.rb
index 0af6eb69ce..d3201966dc 100644
--- a/activemodel/test/cases/validations/numericality_validation_test.rb
+++ b/activemodel/test/cases/validations/numericality_validation_test.rb
@@ -106,6 +106,24 @@ class NumericalityValidationTest < ActiveModel::TestCase
     valid!([2])
   end
 
+  def test_validates_numericality_with_proc
+    Topic.send(:define_method, :min_approved, lambda { 5 })
+    Topic.validates_numericality_of :approved, :greater_than_or_equal_to => Proc.new {|topic| topic.min_approved }
+
+    invalid!([3, 4])
+    valid!([5, 6])
+    Topic.send(:remove_method, :min_approved)
+  end
+
+  def test_validates_numericality_with_symbol
+    Topic.send(:define_method, :max_approved, lambda { 5 })
+    Topic.validates_numericality_of :approved, :less_than_or_equal_to => :max_approved
+
+    invalid!([6])
+    valid!([4, 5])
+    Topic.send(:remove_method, :max_approved)
+  end
+
   def test_validates_numericality_with_numeric_message
     Topic.validates_numericality_of :approved, :less_than => 4, :message => "smaller than {{count}}"
     topic = Topic.new("title" => "numeric test", "approved" => 10)