From c1304098cca8a9247a9ad1461a1a343354650843 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Wed, 2 Dec 2009 20:01:01 -0800
Subject: Reorganize autoloads:

  * A new module (ActiveSupport::Autoload) is provide that extends
    autoloading with new behavior.
  * All autoloads in modules that have extended ActiveSupport::Autoload
    will be eagerly required in threadsafe environments
  * Autoloads can optionally leave off the path if the path is the same
    as full_constant_name.underscore
  * It is possible to specify that a group of autoloads live under an
    additional path. For instance, all of ActionDispatch's middlewares
    are ActionDispatch::MiddlewareName, but they live under
    "action_dispatch/middlewares/middleware_name"
  * It is possible to specify that a group of autoloads are all found
    at the same path. For instance, a number of exceptions might all
    be declared there.
  * One consequence of this is that testing-related constants are not
    autoloaded. To get the testing helpers for a given component,
    require "component_name/test_case". For instance, "action_controller/test_case".
  * test_help.rb, which is automatically required by a Rails application's
    test helper, requires the test_case.rb for all active components, so
    this change will not be disruptive in existing or new applications.
---
 activemodel/test/cases/helper.rb         | 1 +
 activemodel/test/cases/tests_database.rb | 1 +
 2 files changed, 2 insertions(+)

(limited to 'activemodel/test')

diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
index c1a3f6a4a7..024f2378be 100644
--- a/activemodel/test/cases/helper.rb
+++ b/activemodel/test/cases/helper.rb
@@ -10,6 +10,7 @@ $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
 
 require 'config'
 require 'active_model'
+require 'active_model/test_case'
 
 # Show backtraces for deprecated behavior for quicker cleanup.
 ActiveSupport::Deprecation.debug = true
diff --git a/activemodel/test/cases/tests_database.rb b/activemodel/test/cases/tests_database.rb
index 8dd00ea147..79668dd941 100644
--- a/activemodel/test/cases/tests_database.rb
+++ b/activemodel/test/cases/tests_database.rb
@@ -2,6 +2,7 @@ require 'logger'
 
 $:.unshift(File.dirname(__FILE__) + '/../../../activerecord/lib')
 require 'active_record'
+require 'active_record/test_case'
 require 'active_record/fixtures'
 
 module ActiveModel
-- 
cgit v1.2.3


From 7ee5843c3cedfe36a680d5b28aa31eef45296c50 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Wed, 16 Dec 2009 11:56:51 -0600
Subject: Fully expand relative rails framework paths and make sure we aren't
 adding any to the load path more than once.

---
 activemodel/test/cases/helper.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'activemodel/test')

diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
index 024f2378be..30193956ea 100644
--- a/activemodel/test/cases/helper.rb
+++ b/activemodel/test/cases/helper.rb
@@ -1,11 +1,9 @@
-root = File.expand_path('../../../..', __FILE__)
 begin
-  require "#{root}/vendor/gems/environment"
+  require File.expand_path('../../../../vendor/gems/environment', __FILE__)
 rescue LoadError
-  $:.unshift("#{root}/activesupport/lib")
 end
 
-lib = File.expand_path("#{File.dirname(__FILE__)}/../../lib")
+lib = File.expand_path('../../../lib', __FILE__)
 $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
 
 require 'config'
-- 
cgit v1.2.3


From 2476c5312dcbd29f49672f71617a3d34c6a60cc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 22 Dec 2009 23:12:21 +0100
Subject: Validator is simply sent to validate method. However, the API needs
 to change, so validate accepts a record.

---
 activemodel/test/cases/validations/with_validation_test.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'activemodel/test')

diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index fae87a6188..4350ad69ec 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -14,24 +14,24 @@ class ValidatesWithTest < ActiveRecord::TestCase
   OTHER_ERROR_MESSAGE = "Validation error from other validator"
 
   class ValidatorThatAddsErrors < ActiveModel::Validator
-    def validate()
+    def validate(record)
       record.errors[:base] << ERROR_MESSAGE
     end
   end
 
   class OtherValidatorThatAddsErrors < ActiveModel::Validator
-    def validate()
+    def validate(record)
       record.errors[:base] << OTHER_ERROR_MESSAGE
     end
   end
 
   class ValidatorThatDoesNotAddErrors < ActiveModel::Validator
-    def validate()
+    def validate(record)
     end
   end
 
   class ValidatorThatValidatesOptions < ActiveModel::Validator
-    def validate()
+    def validate(record)
       if options[:field] == :first_name
         record.errors[:base] << ERROR_MESSAGE
       end
@@ -101,8 +101,8 @@ class ValidatesWithTest < ActiveRecord::TestCase
   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)
+    validator.expects(:new).with({:foo => :bar}).returns(validator)
+    validator.expects(:validate).with(topic)
 
     Topic.validates_with(validator, :if => "1 == 1", :foo => :bar)
     assert topic.valid?
-- 
cgit v1.2.3


From f1085f41287687835659fa23079080204fe32e96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 23 Dec 2009 00:36:51 +0100
Subject: Move validations in ActiveModel to validators, however all validatity
 checks are still in the class method.

---
 activemodel/test/cases/validations/with_validation_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activemodel/test')

diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index 4350ad69ec..953ff8aa2d 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -98,10 +98,10 @@ class ValidatesWithTest < ActiveRecord::TestCase
     assert topic.errors[:base].include?(ERROR_MESSAGE)
   end
 
-  test "passes all non-standard configuration options to the validator class" do
+  test "passes all configuration options to the validator class" do
     topic = Topic.new
     validator = mock()
-    validator.expects(:new).with({:foo => :bar}).returns(validator)
+    validator.expects(:new).with(:foo => :bar, :if => "1 == 1").returns(validator)
     validator.expects(:validate).with(topic)
 
     Topic.validates_with(validator, :if => "1 == 1", :foo => :bar)
-- 
cgit v1.2.3


From e31077c9aaec05bdf5ea0386eb42fcc039d86a0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 23 Dec 2009 12:28:02 +0100
Subject: Small clean up in Naming and TTranslation tests.

---
 activemodel/test/cases/naming_test.rb      |  3 ++-
 activemodel/test/cases/translation_test.rb | 36 +++++++++++++-----------------
 activemodel/test/models/person.rb          |  4 ++++
 activemodel/test/models/track_back.rb      |  4 ++++
 4 files changed, 25 insertions(+), 22 deletions(-)
 create mode 100644 activemodel/test/models/track_back.rb

(limited to 'activemodel/test')

diff --git a/activemodel/test/cases/naming_test.rb b/activemodel/test/cases/naming_test.rb
index fe1ea36450..dc39b84ed8 100644
--- a/activemodel/test/cases/naming_test.rb
+++ b/activemodel/test/cases/naming_test.rb
@@ -1,8 +1,9 @@
 require 'cases/helper'
+require 'models/track_back'
 
 class NamingTest < ActiveModel::TestCase
   def setup
-    @model_name = ActiveModel::Name.new(self, 'Post::TrackBack')
+    @model_name = ActiveModel::Name.new(Post::TrackBack)
   end
 
   def test_singular
diff --git a/activemodel/test/cases/translation_test.rb b/activemodel/test/cases/translation_test.rb
index d171784963..bfc1ca12e6 100644
--- a/activemodel/test/cases/translation_test.rb
+++ b/activemodel/test/cases/translation_test.rb
@@ -1,11 +1,5 @@
 require 'cases/helper'
-
-class SuperUser
-  extend ActiveModel::Translation
-end
-
-class User < SuperUser
-end
+require 'models/person'
 
 class ActiveModelI18nTests < ActiveModel::TestCase
 
@@ -14,38 +8,38 @@ class ActiveModelI18nTests < ActiveModel::TestCase
   end
   
   def test_translated_model_attributes
-    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:super_user => {:name => 'super_user name attribute'} } }
-    assert_equal 'super_user name attribute', SuperUser.human_attribute_name('name')
+    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:person => {:name => 'person name attribute'} } }
+    assert_equal 'person name attribute', Person.human_attribute_name('name')
   end
   
   def test_translated_model_attributes_with_symbols
-    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:super_user => {:name => 'super_user name attribute'} } }
-    assert_equal 'super_user name attribute', SuperUser.human_attribute_name(:name)
+    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:person => {:name => 'person name attribute'} } }
+    assert_equal 'person name attribute', Person.human_attribute_name(:name)
   end
 
   def test_translated_model_attributes_with_ancestor
-    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:user => {:name => 'user name attribute'} } }
-    assert_equal 'user name attribute', User.human_attribute_name('name')
+    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:child => {:name => 'child name attribute'} } }
+    assert_equal 'child name attribute', Child.human_attribute_name('name')
   end
 
   def test_translated_model_attributes_with_ancestors_fallback
-    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:super_user => {:name => 'super_user name attribute'} } }
-    assert_equal 'super_user name attribute', User.human_attribute_name('name')
+    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:person => {:name => 'person name attribute'} } }
+    assert_equal 'person name attribute', Child.human_attribute_name('name')
   end
 
   def test_translated_model_names
-    I18n.backend.store_translations 'en', :activemodel => {:models => {:super_user => 'super_user model'} }
-    assert_equal 'super_user model', SuperUser.model_name.human
+    I18n.backend.store_translations 'en', :activemodel => {:models => {:person => 'person model'} }
+    assert_equal 'person model', Person.model_name.human
   end
 
   def test_translated_model_names_with_sti
-    I18n.backend.store_translations 'en', :activemodel => {:models => {:user => 'user model'} }
-    assert_equal 'user model', User.model_name.human
+    I18n.backend.store_translations 'en', :activemodel => {:models => {:child => 'child model'} }
+    assert_equal 'child model', Child.model_name.human
   end
 
   def test_translated_model_names_with_ancestors_fallback
-    I18n.backend.store_translations 'en', :activemodel => {:models => {:super_user => 'super_user model'} }
-    assert_equal 'super_user model', User.model_name.human
+    I18n.backend.store_translations 'en', :activemodel => {:models => {:person => 'person model'} }
+    assert_equal 'person model', Child.model_name.human
   end
 end
 
diff --git a/activemodel/test/models/person.rb b/activemodel/test/models/person.rb
index d98420f900..fad29a51ec 100644
--- a/activemodel/test/models/person.rb
+++ b/activemodel/test/models/person.rb
@@ -1,5 +1,9 @@
 class Person
   include ActiveModel::Validations
+  extend  ActiveModel::Translation
 
   attr_accessor :title, :karma
 end
+
+class Child < Person
+end
diff --git a/activemodel/test/models/track_back.rb b/activemodel/test/models/track_back.rb
new file mode 100644
index 0000000000..d137e4ff8f
--- /dev/null
+++ b/activemodel/test/models/track_back.rb
@@ -0,0 +1,4 @@
+class Post
+  class TrackBack
+  end
+end
\ No newline at end of file
-- 
cgit v1.2.3


From 74098e4cb6de01745db8f1d8d567645553ade7c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 23 Dec 2009 13:30:58 +0100
Subject: No need to use ValidationsRepairHelper hack on ActiveModel anymore,
 Model.reset_callbacks(:validate) is enough. However, tests in ActiveRecord
 are still coupled, so moved ValidationsRepairHelper back there.

---
 .../validations/acceptance_validation_test.rb      | 33 +++++--------
 .../validations/conditional_validation_test.rb     |  5 +-
 .../validations/confirmation_validation_test.rb    | 34 +++++---------
 .../cases/validations/exclusion_validation_test.rb | 23 ++++-----
 .../cases/validations/format_validation_test.rb    | 33 +++++--------
 .../test/cases/validations/i18n_validation_test.rb |  1 -
 .../cases/validations/inclusion_validation_test.rb | 33 +++++--------
 .../cases/validations/length_validation_test.rb    | 53 +++++----------------
 .../validations/numericality_validation_test.rb    | 41 +++++-----------
 .../cases/validations/presence_validation_test.rb  | 54 +++++++++++-----------
 .../test/cases/validations/with_validation_test.rb |  5 +-
 activemodel/test/cases/validations_test.rb         |  5 +-
 activemodel/test/models/person.rb                  |  2 +-
 13 files changed, 120 insertions(+), 202 deletions(-)

(limited to 'activemodel/test')

diff --git a/activemodel/test/cases/validations/acceptance_validation_test.rb b/activemodel/test/cases/validations/acceptance_validation_test.rb
index 88e5fdb358..11c9c1edfd 100644
--- a/activemodel/test/cases/validations/acceptance_validation_test.rb
+++ b/activemodel/test/cases/validations/acceptance_validation_test.rb
@@ -9,9 +9,10 @@ require 'models/person'
 
 class AcceptanceValidationTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
 
-  repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
 
   def test_terms_of_service_agreement_no_acceptance
     Topic.validates_acceptance_of(:terms_of_service, :on => :create)
@@ -53,28 +54,18 @@ class AcceptanceValidationTest < ActiveModel::TestCase
     assert t.save
   end
 
-  def test_validates_acceptance_of_with_custom_error_using_quotes
-    repair_validations(Developer) do
-      Developer.validates_acceptance_of :salary, :message=> "This string contains 'single' and \"double\" quotes"
-      d = Developer.new
-      d.salary = "0"
-      assert !d.valid?
-      assert_equal "This string contains 'single' and \"double\" quotes", d.errors[:salary].last
-    end
-  end
-
   def test_validates_acceptance_of_for_ruby_class
-    repair_validations(Person) do
-      Person.validates_acceptance_of :karma
+    Person.validates_acceptance_of :karma
 
-      p = Person.new
-      p.karma = ""
+    p = Person.new
+    p.karma = ""
 
-      assert p.invalid?
-      assert_equal ["must be accepted"], p.errors[:karma]
+    assert p.invalid?
+    assert_equal ["must be accepted"], p.errors[:karma]
 
-      p.karma = "1"
-      assert p.valid?
-    end
+    p.karma = "1"
+    assert p.valid?
+  ensure
+    Person.reset_callbacks(:validate)
   end
 end
diff --git a/activemodel/test/cases/validations/conditional_validation_test.rb b/activemodel/test/cases/validations/conditional_validation_test.rb
index 4c716d5d48..5260162a58 100644
--- a/activemodel/test/cases/validations/conditional_validation_test.rb
+++ b/activemodel/test/cases/validations/conditional_validation_test.rb
@@ -6,9 +6,10 @@ require 'models/topic'
 
 class ConditionalValidationTest < ActiveModel::TestCase
  include ActiveModel::TestsDatabase
- include ActiveModel::ValidationsRepairHelper
 
- repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
   
   def test_if_validation_using_method_true
     # When the method returns true
diff --git a/activemodel/test/cases/validations/confirmation_validation_test.rb b/activemodel/test/cases/validations/confirmation_validation_test.rb
index 1d6f2a6ec5..55554d5054 100644
--- a/activemodel/test/cases/validations/confirmation_validation_test.rb
+++ b/activemodel/test/cases/validations/confirmation_validation_test.rb
@@ -8,9 +8,10 @@ require 'models/person'
 
 class ConfirmationValidationTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
 
-  repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
 
   def test_no_title_confirmation
     Topic.validates_confirmation_of(:title)
@@ -39,30 +40,19 @@ class ConfirmationValidationTest < ActiveModel::TestCase
     assert t.save
   end
 
-  def test_validates_confirmation_of_with_custom_error_using_quotes
-    repair_validations(Developer) do
-      Developer.validates_confirmation_of :name, :message=> "confirm 'single' and \"double\" quotes"
-      d = Developer.new
-      d.name = "John"
-      d.name_confirmation = "Johnny"
-      assert !d.valid?
-      assert_equal ["confirm 'single' and \"double\" quotes"], d.errors[:name]
-    end
-  end
-
   def test_validates_confirmation_of_for_ruby_class
-    repair_validations(Person) do
-      Person.validates_confirmation_of :karma
+    Person.validates_confirmation_of :karma
 
-      p = Person.new
-      p.karma_confirmation = "None"
-      assert p.invalid?
+    p = Person.new
+    p.karma_confirmation = "None"
+    assert p.invalid?
 
-      assert_equal ["doesn't match confirmation"], p.errors[:karma]
+    assert_equal ["doesn't match confirmation"], p.errors[:karma]
 
-      p.karma = "None"
-      assert p.valid?
-    end
+    p.karma = "None"
+    assert p.valid?
+  ensure
+    Person.reset_callbacks(:validate)
   end
 
 end
diff --git a/activemodel/test/cases/validations/exclusion_validation_test.rb b/activemodel/test/cases/validations/exclusion_validation_test.rb
index 584f009e84..7d851f546c 100644
--- a/activemodel/test/cases/validations/exclusion_validation_test.rb
+++ b/activemodel/test/cases/validations/exclusion_validation_test.rb
@@ -7,9 +7,10 @@ require 'models/person'
 
 class ExclusionValidationTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
 
-  repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
 
   def test_validates_exclusion_of
     Topic.validates_exclusion_of( :title, :in => %w( abe monkey ) )
@@ -30,17 +31,17 @@ class ExclusionValidationTest < ActiveModel::TestCase
   end
 
   def test_validates_exclusion_of_for_ruby_class
-    repair_validations(Person) do
-      Person.validates_exclusion_of :karma, :in => %w( abe monkey )
+    Person.validates_exclusion_of :karma, :in => %w( abe monkey )
 
-      p = Person.new
-      p.karma = "abe"
-      assert p.invalid?
+    p = Person.new
+    p.karma = "abe"
+    assert p.invalid?
 
-      assert_equal ["is reserved"], p.errors[:karma]
+    assert_equal ["is reserved"], p.errors[:karma]
 
-      p.karma = "Lifo"
-      assert p.valid?
-    end
+    p.karma = "Lifo"
+    assert p.valid?
+  ensure
+    Person.reset_callbacks(:validate)
   end
 end
diff --git a/activemodel/test/cases/validations/format_validation_test.rb b/activemodel/test/cases/validations/format_validation_test.rb
index e19e4bf7b3..e10089208a 100644
--- a/activemodel/test/cases/validations/format_validation_test.rb
+++ b/activemodel/test/cases/validations/format_validation_test.rb
@@ -8,9 +8,10 @@ require 'models/person'
 
 class PresenceValidationTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
 
-  repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
 
   def test_validate_format
     Topic.validates_format_of(:title, :content, :with => /^Validation\smacros \w+!$/, :message => "is bad data")
@@ -100,28 +101,18 @@ class PresenceValidationTest < ActiveModel::TestCase
     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"
-      d = Developer.new
-      d.name = d.name_confirmation = "John 32"
-      assert !d.valid?
-      assert_equal ["format 'single' and \"double\" quotes"], d.errors[:name]
-    end
-  end
-
   def test_validates_format_of_for_ruby_class
-    repair_validations(Person) do
-      Person.validates_format_of :karma, :with => /\A\d+\Z/
+    Person.validates_format_of :karma, :with => /\A\d+\Z/
 
-      p = Person.new
-      p.karma = "Pixies"
-      assert p.invalid?
+    p = Person.new
+    p.karma = "Pixies"
+    assert p.invalid?
 
-      assert_equal ["is invalid"], p.errors[:karma]
+    assert_equal ["is invalid"], p.errors[:karma]
 
-      p.karma = "1234"
-      assert p.valid?
-    end
+    p.karma = "1234"
+    assert p.valid?
+  ensure
+    Person.reset_callbacks(:validate)
   end
 end
diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb
index 68b1b27f75..2717a09331 100644
--- a/activemodel/test/cases/validations/i18n_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_validation_test.rb
@@ -1,6 +1,5 @@
 require "cases/helper"
 require 'cases/tests_database'
-
 require 'models/person'
 
 class I18nValidationTest < ActiveModel::TestCase
diff --git a/activemodel/test/cases/validations/inclusion_validation_test.rb b/activemodel/test/cases/validations/inclusion_validation_test.rb
index bc1b0365d2..6b2bcd9c60 100644
--- a/activemodel/test/cases/validations/inclusion_validation_test.rb
+++ b/activemodel/test/cases/validations/inclusion_validation_test.rb
@@ -8,9 +8,10 @@ require 'models/person'
 
 class InclusionValidationTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
 
-  repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
 
   def test_validates_inclusion_of
     Topic.validates_inclusion_of( :title, :in => %w( a b c d e f g ) )
@@ -53,28 +54,18 @@ class InclusionValidationTest < ActiveModel::TestCase
     assert_equal ["option uhoh is not in the list"], t.errors[:title]
   end
 
-  def test_validates_inclusion_of_with_custom_error_using_quotes
-    repair_validations(Developer) do
-      Developer.validates_inclusion_of :salary, :in => 1000..80000, :message=> "This string contains 'single' and \"double\" quotes"
-      d = Developer.new
-      d.salary = "90,000"
-      assert !d.valid?
-      assert_equal "This string contains 'single' and \"double\" quotes", d.errors[:salary].last
-    end
-  end
-
   def test_validates_inclusion_of_for_ruby_class
-    repair_validations(Person) do
-      Person.validates_inclusion_of :karma, :in => %w( abe monkey )
+    Person.validates_inclusion_of :karma, :in => %w( abe monkey )
 
-      p = Person.new
-      p.karma = "Lifo"
-      assert p.invalid?
+    p = Person.new
+    p.karma = "Lifo"
+    assert p.invalid?
 
-      assert_equal ["is not included in the list"], p.errors[:karma]
+    assert_equal ["is not included in the list"], p.errors[:karma]
 
-      p.karma = "monkey"
-      assert p.valid?
-    end
+    p.karma = "monkey"
+    assert p.valid?
+  ensure
+    Person.reset_callbacks(:validate)
   end
 end
diff --git a/activemodel/test/cases/validations/length_validation_test.rb b/activemodel/test/cases/validations/length_validation_test.rb
index 2c97b762f1..f3ef5e648a 100644
--- a/activemodel/test/cases/validations/length_validation_test.rb
+++ b/activemodel/test/cases/validations/length_validation_test.rb
@@ -8,9 +8,10 @@ require 'models/person'
 
 class LengthValidationTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
 
-  repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
 
   def test_validates_length_of_with_allow_nil
     Topic.validates_length_of( :title, :is => 5, :allow_nil=>true )
@@ -419,48 +420,18 @@ class LengthValidationTest < ActiveModel::TestCase
     assert_equal ["Your essay must be at least 5 words."], t.errors[:content]
   end
 
-  def test_validates_length_of_with_custom_too_long_using_quotes
-    repair_validations(Developer) do
-      Developer.validates_length_of :name, :maximum => 4, :too_long=> "This string contains 'single' and \"double\" quotes"
-      d = Developer.new
-      d.name = "Jeffrey"
-      assert !d.valid?
-      assert_equal ["This string contains 'single' and \"double\" quotes"], d.errors[:name]
-    end
-  end
-
-  def test_validates_length_of_with_custom_too_short_using_quotes
-    repair_validations(Developer) do
-      Developer.validates_length_of :name, :minimum => 4, :too_short=> "This string contains 'single' and \"double\" quotes"
-      d = Developer.new
-      d.name = "Joe"
-      assert !d.valid?
-      assert_equal ["This string contains 'single' and \"double\" quotes"], d.errors[:name]
-    end
-  end
-
-  def test_validates_length_of_with_custom_message_using_quotes
-    repair_validations(Developer) do
-      Developer.validates_length_of :name, :minimum => 4, :message=> "This string contains 'single' and \"double\" quotes"
-      d = Developer.new
-      d.name = "Joe"
-      assert !d.valid?
-      assert_equal ["This string contains 'single' and \"double\" quotes"], d.errors[:name]
-    end
-  end
-
   def test_validates_length_of_for_ruby_class
-    repair_validations(Person) do
-      Person.validates_length_of :karma, :minimum => 5
+    Person.validates_length_of :karma, :minimum => 5
 
-      p = Person.new
-      p.karma = "Pix"
-      assert p.invalid?
+    p = Person.new
+    p.karma = "Pix"
+    assert p.invalid?
 
-      assert_equal ["is too short (minimum is 5 characters)"], p.errors[:karma]
+    assert_equal ["is too short (minimum is 5 characters)"], p.errors[:karma]
 
-      p.karma = "The Smiths"
-      assert p.valid?
-    end
+    p.karma = "The Smiths"
+    assert p.valid?
+  ensure
+    Person.reset_callbacks(:validate)
   end
 end
diff --git a/activemodel/test/cases/validations/numericality_validation_test.rb b/activemodel/test/cases/validations/numericality_validation_test.rb
index d3201966dc..75cd654f98 100644
--- a/activemodel/test/cases/validations/numericality_validation_test.rb
+++ b/activemodel/test/cases/validations/numericality_validation_test.rb
@@ -8,9 +8,10 @@ require 'models/person'
 
 class NumericalityValidationTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
 
-  repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
 
   NIL = [nil]
   BLANK = ["", " ", " \t \r \n"]
@@ -138,37 +139,19 @@ class NumericalityValidationTest < ActiveModel::TestCase
     assert_equal ["greater than 4"], topic.errors[:approved]
   end
 
-  def test_numericality_with_getter_method
-    repair_validations(Developer) do
-      Developer.validates_numericality_of( :salary )
-      developer = Developer.new("name" => "michael", "salary" => nil)
-      developer.instance_eval("def salary; read_attribute('salary') ? read_attribute('salary') : 100000; end")
-      assert developer.valid?
-    end
-  end
-
-  def test_numericality_with_allow_nil_and_getter_method
-    repair_validations(Developer) do
-      Developer.validates_numericality_of( :salary, :allow_nil => true)
-      developer = Developer.new("name" => "michael", "salary" => nil)
-      developer.instance_eval("def salary; read_attribute('salary') ? read_attribute('salary') : 100000; end")
-      assert developer.valid?
-    end
-  end
-
   def test_validates_numericality_of_for_ruby_class
-    repair_validations(Person) do
-      Person.validates_numericality_of :karma, :allow_nil => false
+    Person.validates_numericality_of :karma, :allow_nil => false
 
-      p = Person.new
-      p.karma = "Pix"
-      assert p.invalid?
+    p = Person.new
+    p.karma = "Pix"
+    assert p.invalid?
 
-      assert_equal ["is not a number"], p.errors[:karma]
+    assert_equal ["is not a number"], p.errors[:karma]
 
-      p.karma = "1234"
-      assert p.valid?
-    end
+    p.karma = "1234"
+    assert p.valid?
+  ensure
+    Person.reset_callbacks(:validate)
   end
 
   private
diff --git a/activemodel/test/cases/validations/presence_validation_test.rb b/activemodel/test/cases/validations/presence_validation_test.rb
index 90b0951a77..8b9795a90c 100644
--- a/activemodel/test/cases/validations/presence_validation_test.rb
+++ b/activemodel/test/cases/validations/presence_validation_test.rb
@@ -9,9 +9,6 @@ require 'models/custom_reader'
 
 class PresenceValidationTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
-
-  repair_validations(Topic)
 
   def test_validate_presences
     Topic.validates_presence_of(:title, :content)
@@ -30,43 +27,44 @@ class PresenceValidationTest < ActiveModel::TestCase
     t.content = "like stuff"
 
     assert t.save
+  ensure
+    Topic.reset_callbacks(:validate)
   end
 
-  # def test_validates_presence_of_with_custom_message_using_quotes
-  #   repair_validations(Developer) do
-  #     Developer.validates_presence_of :non_existent, :message=> "This string contains 'single' and \"double\" quotes"
-  #     d = Developer.new
-  #     d.name = "Joe"
-  #     assert !d.valid?
-  #     assert_equal ["This string contains 'single' and \"double\" quotes"], d.errors[:non_existent]
-  #   end
-  # end
+  def test_validates_acceptance_of_with_custom_error_using_quotes
+    Person.validates_presence_of :karma, :message=> "This string contains 'single' and \"double\" quotes"
+    p = Person.new
+    assert !p.valid?
+    assert_equal "This string contains 'single' and \"double\" quotes", p.errors[:karma].last
+  ensure
+    Person.reset_callbacks(:validate)
+  end
 
   def test_validates_presence_of_for_ruby_class
-    repair_validations(Person) do
-      Person.validates_presence_of :karma
+    Person.validates_presence_of :karma
 
-      p = Person.new
-      assert p.invalid?
+    p = Person.new
+    assert p.invalid?
 
-      assert_equal ["can't be blank"], p.errors[:karma]
+    assert_equal ["can't be blank"], p.errors[:karma]
 
-      p.karma = "Cold"
-      assert p.valid?
-    end
+    p.karma = "Cold"
+    assert p.valid?
+  ensure
+    Person.reset_callbacks(:validate)
   end
   
   def test_validates_presence_of_for_ruby_class_with_custom_reader
-    repair_validations(Person) do
-      CustomReader.validates_presence_of :karma
+    CustomReader.validates_presence_of :karma
 
-      p = CustomReader.new
-      assert p.invalid?
+    p = CustomReader.new
+    assert p.invalid?
 
-      assert_equal ["can't be blank"], p.errors[:karma]
+    assert_equal ["can't be blank"], p.errors[:karma]
 
-      p[:karma] = "Cold"
-      assert p.valid?
-    end
+    p[:karma] = "Cold"
+    assert p.valid?
+  ensure
+    CustomReader.reset_callbacks(:validate)
   end
 end
diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index 953ff8aa2d..9e9b925df2 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -6,9 +6,10 @@ require 'models/topic'
 
 class ValidatesWithTest < ActiveRecord::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
 
-  repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
 
   ERROR_MESSAGE = "Validation error from validator"
   OTHER_ERROR_MESSAGE = "Validation error from other validator"
diff --git a/activemodel/test/cases/validations_test.rb b/activemodel/test/cases/validations_test.rb
index 78565177d8..61910395b5 100644
--- a/activemodel/test/cases/validations_test.rb
+++ b/activemodel/test/cases/validations_test.rb
@@ -9,11 +9,12 @@ require 'models/custom_reader'
 
 class ValidationsTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
-  include ActiveModel::ValidationsRepairHelper
 
   # Most of the tests mess with the validations of Topic, so lets repair it all the time.
   # Other classes we mess with will be dealt with in the specific tests
-  repair_validations(Topic)
+  def teardown
+    Topic.reset_callbacks(:validate)
+  end
 
   def test_single_field_validation
     r = Reply.new
diff --git a/activemodel/test/models/person.rb b/activemodel/test/models/person.rb
index fad29a51ec..c83d768379 100644
--- a/activemodel/test/models/person.rb
+++ b/activemodel/test/models/person.rb
@@ -2,7 +2,7 @@ class Person
   include ActiveModel::Validations
   extend  ActiveModel::Translation
 
-  attr_accessor :title, :karma
+  attr_accessor :title, :karma, :salary
 end
 
 class Child < Person
-- 
cgit v1.2.3


From 6d390671f639b3314437054df0d393cef10493bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 29 Dec 2009 01:15:39 +0100
Subject: Move ActiveRecord callbacks implementation to ActiveModel and make
 use of it.

Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
---
 activemodel/test/cases/callbacks_test.rb | 70 ++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 activemodel/test/cases/callbacks_test.rb

(limited to 'activemodel/test')

diff --git a/activemodel/test/cases/callbacks_test.rb b/activemodel/test/cases/callbacks_test.rb
new file mode 100644
index 0000000000..b996f51d6b
--- /dev/null
+++ b/activemodel/test/cases/callbacks_test.rb
@@ -0,0 +1,70 @@
+require "cases/helper"
+
+class CallbacksTest < ActiveModel::TestCase
+
+  class CallbackValidator
+    def around_create(model)
+      model.callbacks << :before_around_create
+      yield
+      model.callbacks << :after_around_create
+    end
+  end
+
+  class ModelCallbacks
+    attr_reader :callbacks
+    extend ActiveModel::Callbacks
+
+    define_model_callbacks :create
+    define_model_callbacks :initialize, :only => :after
+
+    before_create :before_create
+    around_create CallbackValidator.new
+
+    after_create do |model|
+      model.callbacks << :after_create
+    end
+
+    after_create "@callbacks << :final_callback"
+
+    def initialize(valid=true)
+      @callbacks, @valid = [], valid
+    end
+
+    def before_create
+      @callbacks << :before_create
+    end
+
+    def create
+      _run_create_callbacks do
+        @callbacks << :create
+        @valid
+      end
+    end
+  end
+
+  test "complete callback chain" do
+    model = ModelCallbacks.new
+    model.create
+    assert_equal model.callbacks, [ :before_create, :before_around_create, :create,
+                                    :after_around_create, :after_create, :final_callback]
+  end
+
+  test "after callbacks are always appended" do
+    model = ModelCallbacks.new
+    model.create
+    assert_equal model.callbacks.last, :final_callback
+  end
+
+  test "after callbacks are not executed if the block returns false" do
+    model = ModelCallbacks.new(false)
+    model.create
+    assert_equal model.callbacks, [ :before_create, :before_around_create,
+                                    :create, :after_around_create]
+  end
+
+  test "only selects which types of callbacks should be created" do
+    assert !ModelCallbacks.respond_to?(:before_initialize)
+    assert !ModelCallbacks.respond_to?(:around_initialize)
+    assert ModelCallbacks.respond_to?(:after_initialize)
+  end
+end
-- 
cgit v1.2.3


From 5fdd0e80a4db778268e80435b471090cb14f7229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 31 Dec 2009 13:44:15 +0100
Subject: Be sure to convert namespaced names to we have 'Parrots name' instead
 of 'Parrots.name' in error messages.

---
 activemodel/test/cases/validations/i18n_validation_test.rb | 2 +-
 activemodel/test/cases/validations_test.rb                 | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'activemodel/test')

diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb
index 2717a09331..1cec15110e 100644
--- a/activemodel/test/cases/validations/i18n_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_validation_test.rb
@@ -57,7 +57,7 @@ class I18nValidationTest < ActiveModel::TestCase
 
   def test_errors_full_messages_translates_human_attribute_name_for_model_attributes
     @person.errors.add('name', 'empty')
-    I18n.expects(:translate).with(:"person.name", :default => ['Name'], :scope => [:activemodel, :attributes], :count => 1).returns('Name')
+    I18n.expects(:translate).with(:"person.name", :default => ['Name', 'Name'], :scope => [:activemodel, :attributes], :count => 1).returns('Name')
     @person.errors.full_messages
   end
 
diff --git a/activemodel/test/cases/validations_test.rb b/activemodel/test/cases/validations_test.rb
index 61910395b5..38a2a716a7 100644
--- a/activemodel/test/cases/validations_test.rb
+++ b/activemodel/test/cases/validations_test.rb
@@ -71,6 +71,12 @@ class ValidationsTest < ActiveModel::TestCase
     assert_equal 2, r.errors.count
   end
 
+  def test_errors_on_nested_attributes_expands_name
+    t = Topic.new
+    t.errors["replies.name"] << "can't be blank"
+    assert_equal ["Replies name can't be blank"], t.errors.full_messages
+  end
+
   def test_errors_on_base
     r = Reply.new
     r.content = "Mismatch"
-- 
cgit v1.2.3


From 7cc0a4cfa1d18c011d6e41f57d25eb10ed018eba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 31 Dec 2009 14:14:29 +0100
Subject: Use activerecord.errors.format as in Rails 2.3.5.

---
 activemodel/test/cases/validations/i18n_validation_test.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'activemodel/test')

diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb
index 1cec15110e..d061b5642c 100644
--- a/activemodel/test/cases/validations/i18n_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_validation_test.rb
@@ -61,6 +61,12 @@ class I18nValidationTest < ActiveModel::TestCase
     @person.errors.full_messages
   end
 
+  def test_errors_full_messages_uses_format
+    I18n.backend.store_translations('en', :activemodel => {:errors => {:format => "Field {{attribute}} {{message}}"}})
+    @person.errors.add('name', 'empty')
+    assert_equal ["Field Name empty"], @person.errors.full_messages
+  end
+
   # ActiveRecord::Validations
   # validates_confirmation_of w/ mocha
   def test_validates_confirmation_of_generates_message
-- 
cgit v1.2.3


From 653fa4c10c3e4a34cfe0fe93a2612ed178ca4455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 31 Dec 2009 14:19:30 +0100
Subject: Add naming to AMo::Lint

---
 activemodel/test/cases/lint_test.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'activemodel/test')

diff --git a/activemodel/test/cases/lint_test.rb b/activemodel/test/cases/lint_test.rb
index da7d2112dc..63804004ee 100644
--- a/activemodel/test/cases/lint_test.rb
+++ b/activemodel/test/cases/lint_test.rb
@@ -4,6 +4,8 @@ class LintTest < ActiveModel::TestCase
   include ActiveModel::Lint::Tests
 
   class CompliantModel
+    extend ActiveModel::Naming
+
     def to_model
       self
     end
-- 
cgit v1.2.3


From 08986ce2902e94a195ea8661ec1a5a302e3d41f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 2 Jan 2010 22:23:31 +0100
Subject: Remove deprecated ActiveModel tests (%d and %s is no longer supported
 in error messages a couple months already)

---
 activemodel/test/cases/validations/i18n_validation_test.rb | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'activemodel/test')

diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb
index d061b5642c..a7656fe219 100644
--- a/activemodel/test/cases/validations/i18n_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_validation_test.rb
@@ -21,20 +21,6 @@ class I18nValidationTest < ActiveModel::TestCase
     I18n.backend = @old_backend
   end
 
-  def test_percent_s_interpolation_syntax_in_error_messages_was_deprecated
-    assert_not_deprecated do
-      default = "%s interpolation syntax was deprecated"
-      assert_equal default, I18n.t(:does_not_exist, :default => default, :value => 'this')
-    end
-  end
-
-  def test_percent_d_interpolation_syntax_in_error_messages_was_deprecated
-    assert_not_deprecated do
-      default = "%d interpolation syntaxes are deprecated"
-      assert_equal default, I18n.t(:does_not_exist, :default => default, :count => 2)
-    end
-  end
-
   def test_errors_add_on_empty_generates_message
     @person.errors.expects(:generate_message).with(:title, :empty, {:default => nil})
     @person.errors.add_on_empty :title
-- 
cgit v1.2.3


From 4796be33a464a4587d0e22dfef113aca597c91c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 3 Jan 2010 16:58:33 +0100
Subject: Add missing tests to Validators.

---
 .../test/cases/validations/with_validation_test.rb | 47 ++++++++++++++++++++++
 1 file changed, 47 insertions(+)

(limited to 'activemodel/test')

diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index 9e9b925df2..7540ccb580 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -39,6 +39,18 @@ class ValidatesWithTest < ActiveRecord::TestCase
     end
   end
 
+  class ValidatorPerEachAttribute < ActiveModel::EachValidator
+    def validate_each(record, attribute, value)
+      record.errors[attribute] << "Value is #{value}"
+    end
+  end
+
+  class ValidatorCheckValidity < ActiveModel::EachValidator
+    def check_validity!
+      raise "boom!"
+    end
+  end
+
   test "vaidation with class that adds errors" do
     Topic.validates_with(ValidatorThatAddsErrors)
     topic = Topic.new
@@ -116,4 +128,39 @@ class ValidatesWithTest < ActiveRecord::TestCase
     assert topic.errors[:base].include?(ERROR_MESSAGE)
   end
 
+  test "validates_with each validator" do
+    Topic.validates_with(ValidatorPerEachAttribute, :attributes => [:title, :content])
+    topic = Topic.new :title => "Title", :content => "Content"
+    assert !topic.valid?
+    assert_equal ["Value is Title"], topic.errors[:title]
+    assert_equal ["Value is Content"], topic.errors[:content]
+  end
+
+  test "each validator checks validity" do
+    assert_raise RuntimeError do
+      Topic.validates_with(ValidatorCheckValidity, :attributes => [:title])
+    end
+  end
+
+  test "each validator expects attributes to be given" do
+    assert_raise RuntimeError do
+      Topic.validates_with(ValidatorPerEachAttribute)
+    end
+  end
+
+  test "each validator skip nil values if :allow_nil is set to true" do
+    Topic.validates_with(ValidatorPerEachAttribute, :attributes => [:title, :content], :allow_nil => true)
+    topic = Topic.new :content => ""
+    assert !topic.valid?
+    assert topic.errors[:title].empty?
+    assert_equal ["Value is "], topic.errors[:content]
+  end
+
+  test "each validator skip blank values if :allow_blank is set to true" do
+    Topic.validates_with(ValidatorPerEachAttribute, :attributes => [:title, :content], :allow_blank => true)
+    topic = Topic.new :content => ""
+    assert topic.valid?
+    assert topic.errors[:title].empty?
+    assert topic.errors[:content].empty?
+  end
 end
-- 
cgit v1.2.3