5 files changed, 217 insertions, 9 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/tests_database.rb b/activemodel/test/cases/tests_database.rb
index 0f4475fa2d..8dd00ea147 100644
--- a/activemodel/test/cases/tests_database.rb
+++ b/activemodel/test/cases/tests_database.rb
@@ -27,15 +27,10 @@ module ActiveModel
 
     def self.setup_connection
       defaults = { :database => ':memory:' }
-      begin
-        adapter = defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'
-        options = defaults.merge :adapter => adapter, :timeout => 500
-        ActiveRecord::Base.establish_connection(options)
-      rescue Exception
-        $stderr.puts 'SQLite 3 unavailable; trying SQLite 2.'
-        options = defaults.merge :adapter => 'sqlite'
-        ActiveRecord::Base.establish_connection(options)
-      end
+
+      adapter = defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'
+      options = defaults.merge :adapter => adapter, :timeout => 500
+      ActiveRecord::Base.establish_connection(options)
     end
   end
 end
diff --git a/activemodel/test/cases/validations/format_validation_test.rb b/activemodel/test/cases/validations/format_validation_test.rb
index 2c06a9dd02..e19e4bf7b3 100644
--- a/activemodel/test/cases/validations/format_validation_test.rb
+++ b/activemodel/test/cases/validations/format_validation_test.rb
@@ -71,6 +71,35 @@ class PresenceValidationTest < ActiveModel::TestCase
     assert_equal ["can't be Invalid title"], t.errors[:title]
   end
 
+  def test_validate_format_with_not_option
+    Topic.validates_format_of(:title, :without => /foo/, :message => "should not contain foo")
+    t = Topic.new
+
+    t.title = "foobar"
+    t.valid?
+    assert_equal ["should not contain foo"], t.errors[:title]
+
+    t.title = "something else"
+    t.valid?
+    assert_equal [], t.errors[:title]
+  end
+
+  def test_validate_format_of_without_any_regexp_should_raise_error
+    assert_raise(ArgumentError) { Topic.validates_format_of(:title) }
+  end
+
+  def test_validates_format_of_with_both_regexps_should_raise_error
+    assert_raise(ArgumentError) { Topic.validates_format_of(:title, :with => /this/, :without => /that/) }
+  end
+
+  def test_validates_format_of_when_with_isnt_a_regexp_should_raise_error
+    assert_raise(ArgumentError) { Topic.validates_format_of(:title, :with => "clearly not a regexp") }
+  end
+
+  def test_validates_format_of_when_not_isnt_a_regexp_should_raise_error
+    assert_raise(ArgumentError) { Topic.validates_format_of(:title, :without => "clearly not a regexp") }
+  end
+
   def test_validates_format_of_with_custom_error_using_quotes
     repair_validations(Developer) do
       Developer.validates_format_of :name, :with => /^(A-Z*)$/, :message=> "format 'single' and \"double\" quotes"
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)
diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
new file mode 100644
index 0000000000..f55fdc5864
--- /dev/null
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -0,0 +1,116 @@
+# encoding: utf-8
+require 'cases/helper'
+
+require 'models/topic'
+
+class ValidatesWithTest < ActiveRecord::TestCase
+  include ActiveModel::ValidationsRepairHelper
+
+  repair_validations(Topic)
+
+  ERROR_MESSAGE = "Validation error from validator"
+  OTHER_ERROR_MESSAGE = "Validation error from other validator"
+
+  class ValidatorThatAddsErrors < ActiveRecord::Validator
+    def validate()
+      record.errors[:base] << ERROR_MESSAGE
+    end
+  end
+
+  class OtherValidatorThatAddsErrors < ActiveRecord::Validator
+    def validate()
+      record.errors[:base] << OTHER_ERROR_MESSAGE
+    end
+  end
+
+  class ValidatorThatDoesNotAddErrors < ActiveRecord::Validator
+    def validate()
+    end
+  end
+
+  class ValidatorThatValidatesOptions < ActiveRecord::Validator
+    def validate()
+      if options[:field] == :first_name
+        record.errors[:base] << ERROR_MESSAGE
+      end
+    end
+  end
+
+  test "vaidation with class that adds errors" do
+    Topic.validates_with(ValidatorThatAddsErrors)
+    topic = Topic.new
+    assert !topic.valid?, "A class that adds errors causes the record to be invalid"
+    assert topic.errors[:base].include?(ERROR_MESSAGE)
+  end
+
+  test "with a class that returns valid" do
+    Topic.validates_with(ValidatorThatDoesNotAddErrors)
+    topic = Topic.new
+    assert topic.valid?, "A class that does not add errors does not cause the record to be invalid"
+  end
+
+  test "with a class that adds errors on update and a new record" do
+    Topic.validates_with(ValidatorThatAddsErrors, :on => :update)
+    topic = Topic.new
+    assert topic.valid?, "Validation doesn't run on create if 'on' is set to update"
+  end
+
+  test "with a class that adds errors on create and a new record" do
+    Topic.validates_with(ValidatorThatAddsErrors, :on => :create)
+    topic = Topic.new
+    assert !topic.valid?, "Validation does run on create if 'on' is set to create"
+    assert topic.errors[:base].include?(ERROR_MESSAGE)
+  end
+
+  test "with multiple classes" do
+    Topic.validates_with(ValidatorThatAddsErrors, OtherValidatorThatAddsErrors)
+    topic = Topic.new
+    assert !topic.valid?
+    assert topic.errors[:base].include?(ERROR_MESSAGE)
+    assert topic.errors[:base].include?(OTHER_ERROR_MESSAGE)
+  end
+
+  test "with if statements that return false" do
+    Topic.validates_with(ValidatorThatAddsErrors, :if => "1 == 2")
+    topic = Topic.new
+    assert topic.valid?
+  end
+
+  test "with if statements that return true" do
+    Topic.validates_with(ValidatorThatAddsErrors, :if => "1 == 1")
+    topic = Topic.new
+    assert !topic.valid?
+    assert topic.errors[:base].include?(ERROR_MESSAGE)
+  end
+
+  test "with unless statements that return true" do
+    Topic.validates_with(ValidatorThatAddsErrors, :unless => "1 == 1")
+    topic = Topic.new
+    assert topic.valid?
+  end
+
+  test "with unless statements that returns false" do
+    Topic.validates_with(ValidatorThatAddsErrors, :unless => "1 == 2")
+    topic = Topic.new
+    assert !topic.valid?
+    assert topic.errors[:base].include?(ERROR_MESSAGE)
+  end
+
+  test "passes all non-standard configuration options to the validator class" do
+    topic = Topic.new
+    validator = mock()
+    validator.expects(:new).with(topic, {:foo => :bar}).returns(validator)
+    validator.expects(:validate)
+
+    Topic.validates_with(validator, :if => "1 == 1", :foo => :bar)
+    assert topic.valid?
+  end
+
+  test "validates_with with options" do
+    Topic.validates_with(ValidatorThatValidatesOptions, :field => :first_name)
+    topic = Topic.new
+    assert !topic.valid?
+    assert topic.errors[:base].include?(ERROR_MESSAGE)
+  end
+
+end