From 45d41f0dadd9fa171f306ff356770c4492726f30 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Thu, 19 Jun 2008 16:25:27 +0200
Subject: integrating I18n into Rails

---
 activerecord/test/cases/validations_i18n_test.rb | 539 +++++++++++++++++++++++
 1 file changed, 539 insertions(+)
 create mode 100644 activerecord/test/cases/validations_i18n_test.rb

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
new file mode 100644
index 0000000000..eb454fca20
--- /dev/null
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -0,0 +1,539 @@
+require "cases/helper"
+require 'models/topic'
+require 'models/reply'
+
+class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
+  def setup
+    reset_callbacks Topic
+    @topic = Topic.new
+    I18n.backend.add_translations('en-US', :active_record => {:error_messages => {:custom => nil}})
+  end
+  
+  def teardown
+    reset_callbacks Topic
+    load 'active_record/lang/en-US.rb'
+  end
+  
+  def unique_topic
+    @unique ||= Topic.create :title => 'unique!'
+  end
+  
+  def replied_topic
+    @replied_topic ||= begin
+      topic = Topic.create(:title => "topic")
+      topic.replies << Reply.new
+      topic
+    end
+  end
+  
+  def reset_callbacks(*models)
+    models.each do |model|
+      model.instance_variable_set("@validate_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
+      model.instance_variable_set("@validate_on_create_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
+      model.instance_variable_set("@validate_on_update_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
+    end
+  end
+  
+  # ActiveRecord::Errors
+  
+  def test_errors_generate_message_translates_custom_model_attribute_key
+    global_scope = [:active_record, :error_messages]
+    custom_scope = global_scope + [:custom, 'topic', :title]
+    
+    I18n.expects(:translate).with(:invalid, :scope => custom_scope).returns 'translation'
+    I18n.expects(:translate).with(:invalid, :scope => global_scope).never
+    
+    @topic.errors.generate_message :title, :invalid
+  end
+  
+  def test_errors_generate_message_given_a_custom_message_translates_custom_model_attribute_key_with_custom_message_as_default
+    custom_scope = [:active_record, :error_messages, :custom, 'topic', :title]
+    
+    I18n.expects(:translate).with(:invalid, :scope => custom_scope, :default => 'default from class def').returns 'translation'
+    @topic.errors.generate_message :title, :invalid, :default => 'default from class def'
+  end
+  
+  def test_errors_generate_message_given_no_custom_message_falls_back_to_global_default_key_translation
+    global_scope = [:active_record, :error_messages]
+    custom_scope = global_scope + [:custom, 'topic', :title]
+
+    I18n.stubs(:translate).with(:invalid, :scope => custom_scope).returns nil
+    I18n.expects(:translate).with(:invalid, :scope => global_scope)
+    @topic.errors.generate_message :title, :invalid
+  end
+  
+  def test_errors_add_given_no_message_it_translates_invalid
+    I18n.expects(:translate).with(:"active_record.error_messages.invalid")
+    @topic.errors.add :title
+  end
+  
+  def test_errors_add_on_empty_generates_message
+    @topic.errors.expects(:generate_message).with(:title, :empty, {:default => nil})
+    @topic.errors.add_on_empty :title
+  end
+  
+  def test_errors_add_on_empty_generates_message_with_custom_default_message
+    @topic.errors.expects(:generate_message).with(:title, :empty, {:default => 'custom'})
+    @topic.errors.add_on_empty :title, 'custom'
+  end
+  
+  def test_errors_add_on_blank_generates_message
+    @topic.errors.expects(:generate_message).with(:title, :blank, {:default => nil})
+    @topic.errors.add_on_blank :title
+  end
+  
+  def test_errors_add_on_blank_generates_message_with_custom_default_message
+    @topic.errors.expects(:generate_message).with(:title, :blank, {:default => 'custom'})
+    @topic.errors.add_on_blank :title, 'custom'
+  end
+  
+  def test_errors_full_messages_translates_human_attribute_name_for_model_attributes
+    @topic.errors.instance_variable_set :@errors, { 'title' => 'empty' }
+    I18n.expects(:translate).with(:"active_record.human_attribute_names.topic.title", 'en-US').returns('Title')
+    @topic.errors.full_messages :locale => 'en-US'
+  end
+  
+  
+  # ActiveRecord::Validations
+  
+  # validates_confirmation_of
+  
+  def test_validates_confirmation_of_generates_message
+    Topic.validates_confirmation_of :title
+    @topic.title_confirmation = 'foo'
+    @topic.errors.expects(:generate_message).with(:title, :confirmation, {:default => nil})
+    @topic.valid?
+  end
+  
+  def test_validates_confirmation_of_generates_message_with_custom_default_message
+    Topic.validates_confirmation_of :title, :message => 'custom'
+    @topic.title_confirmation = 'foo'
+    @topic.errors.expects(:generate_message).with(:title, :confirmation, {:default => 'custom'})
+    @topic.valid?
+  end
+  
+  def test_validates_confirmation_of_finds_custom_model_key_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:confirmation => 'custom message'}}}}}
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:confirmation => 'global message'}}
+
+    Topic.validates_confirmation_of :title
+    @topic.title_confirmation = 'foo'
+    @topic.valid?
+    assert_equal 'custom message', @topic.errors.on(:title)
+  end
+  
+  def test_validates_confirmation_of_finds_global_default_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:confirmation => 'global message'}}
+
+    Topic.validates_confirmation_of :title
+    @topic.title_confirmation = 'foo'
+    @topic.valid?
+    assert_equal 'global message', @topic.errors.on(:title)
+  end
+  
+  
+  # validates_acceptance_of
+
+  def test_validates_acceptance_of_generates_message
+    Topic.validates_acceptance_of :title, :allow_nil => false
+    @topic.errors.expects(:generate_message).with(:title, :accepted, {:default => nil})
+    @topic.valid?
+  end
+
+  def test_validates_acceptance_of_generates_message_with_custom_default_message
+    Topic.validates_acceptance_of :title, :message => 'custom', :allow_nil => false
+    @topic.errors.expects(:generate_message).with(:title, :accepted, {:default => 'custom'})
+    @topic.valid?
+  end
+  
+  def test_validates_acceptance_of_finds_custom_model_key_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:accepted => 'custom message'}}}}}
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:accepted => 'global message'}}
+
+    Topic.validates_acceptance_of :title, :allow_nil => false
+    @topic.valid?
+    assert_equal 'custom message', @topic.errors.on(:title)
+  end
+  
+  def test_validates_acceptance_of_finds_global_default_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:accepted => 'global message'}}
+
+    Topic.validates_acceptance_of :title, :allow_nil => false
+    @topic.valid?
+    assert_equal 'global message', @topic.errors.on(:title)
+  end
+  
+  
+  # validates_presence_of
+
+  def test_validates_presence_of_generates_message
+    Topic.validates_presence_of :title
+    @topic.errors.expects(:generate_message).with(:title, :blank, {:default => nil})
+    @topic.valid?
+  end
+  
+  def test_validates_presence_of_generates_message_with_custom_default_message
+    Topic.validates_presence_of :title, :message => 'custom'
+    @topic.errors.expects(:generate_message).with(:title, :blank, {:default => 'custom'})
+    @topic.valid?
+  end
+  
+  def test_validates_presence_of_finds_custom_model_key_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:blank => 'custom message'}}}}}
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:blank => 'global message'}}
+
+    Topic.validates_presence_of :title
+    @topic.valid?
+    assert_equal 'custom message', @topic.errors.on(:title)
+  end
+  
+  def test_validates_presence_of_finds_global_default_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:blank => 'global message'}}
+
+    Topic.validates_presence_of :title
+    @topic.valid?
+    assert_equal 'global message', @topic.errors.on(:title)
+  end
+  
+  
+  # validates_length_of :within
+
+  def test_validates_length_of_within_generates_message
+    Topic.validates_length_of :title, :within => 3..5
+    @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => nil})
+    @topic.valid?
+  end
+  
+  def test_validates_length_of_within_generates_message_with_custom_default_message
+    Topic.validates_length_of :title, :within => 3..5, :too_short => 'custom'
+    @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => 'custom'})
+    @topic.valid?
+  end
+  
+  def test_validates_length_of_within_finds_custom_model_key_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:too_short => 'custom message'}}}}}
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:too_short => 'global message'}}
+
+    Topic.validates_length_of :title, :within => 3..5
+    @topic.valid?
+    assert_equal 'custom message', @topic.errors.on(:title)
+  end
+  
+  def test_validates_length_of_within_finds_global_default_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:too_short => 'global message'}}
+
+    Topic.validates_length_of :title, :within => 3..5
+    @topic.valid?
+    assert_equal 'global message', @topic.errors.on(:title)
+  end
+  
+  
+  # validates_length_of :is
+  
+  def test_validates_length_of_is_generates_message
+    Topic.validates_length_of :title, :is => 5
+    @topic.errors.expects(:generate_message).with(:title, :wrong_length, {:count => 5, :default => nil})
+    @topic.valid?
+  end
+  
+  def test_validates_length_of_is_generates_message_with_custom_default_message
+    Topic.validates_length_of :title, :is => 5, :message => 'custom'
+    @topic.errors.expects(:generate_message).with(:title, :wrong_length, {:count => 5, :default => 'custom'})
+    @topic.valid?
+  end
+  
+  def test_validates_length_of_within_finds_custom_model_key_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
+
+    Topic.validates_length_of :title, :is => 5
+    @topic.valid?
+    assert_equal 'custom message', @topic.errors.on(:title)
+  end
+  
+  def test_validates_length_of_within_finds_global_default_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
+
+    Topic.validates_length_of :title, :is => 5
+    @topic.valid?
+    assert_equal 'global message', @topic.errors.on(:title)
+  end
+  
+  
+  # validates_uniqueness_of
+  
+  def test_validates_uniqueness_of_generates_message
+    Topic.validates_uniqueness_of :title
+    @topic.title = unique_topic.title
+    @topic.errors.expects(:generate_message).with(:title, :taken, {:default => nil})
+    @topic.valid?
+  end
+  
+  def test_validates_uniqueness_of_generates_message_with_custom_default_message
+    Topic.validates_uniqueness_of :title, :message => 'custom'
+    @topic.title = unique_topic.title
+    @topic.errors.expects(:generate_message).with(:title, :taken, {:default => 'custom'})
+    @topic.valid?
+  end
+  
+  def test_validates_length_of_within_finds_custom_model_key_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
+
+    Topic.validates_length_of :title, :is => 5
+    @topic.valid?
+    assert_equal 'custom message', @topic.errors.on(:title)
+  end
+  
+  def test_validates_length_of_within_finds_global_default_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
+
+    Topic.validates_length_of :title, :is => 5
+    @topic.valid?
+    assert_equal 'global message', @topic.errors.on(:title)
+  end
+  
+  
+  # validates_format_of
+  
+  def test_validates_format_of_generates_message
+    Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
+    @topic.title = '72x'
+    @topic.errors.expects(:generate_message).with(:title, :invalid, {:value => '72x', :default => nil})
+    @topic.valid?
+  end
+  
+  def test_validates_format_of_generates_message_with_custom_default_message
+    Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/, :message => 'custom'
+    @topic.title = '72x'
+    @topic.errors.expects(:generate_message).with(:title, :invalid, {:value => '72x', :default => 'custom'})
+    @topic.valid?
+  end
+  
+  def test_validates_format_of_finds_custom_model_key_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:invalid => 'custom message'}}}}}
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
+
+    Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
+    @topic.valid?
+    assert_equal 'custom message', @topic.errors.on(:title)
+  end
+  
+  def test_validates_format_of_finds_global_default_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
+
+    Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
+    @topic.valid?
+    assert_equal 'global message', @topic.errors.on(:title)
+  end
+  
+  
+  # validates_inclusion_of
+  
+  def test_validates_inclusion_of_generates_message
+    Topic.validates_inclusion_of :title, :in => %w(a b c)
+    @topic.title = 'z'
+    @topic.errors.expects(:generate_message).with(:title, :inclusion, {:value => 'z', :default => nil})
+    @topic.valid?
+  end
+  
+  def test_validates_inclusion_of_generates_message_with_custom_default_message
+    Topic.validates_inclusion_of :title, :in => %w(a b c), :message => 'custom'
+    @topic.title = 'z'
+    @topic.errors.expects(:generate_message).with(:title, :inclusion, {:value => 'z', :default => 'custom'})
+    @topic.valid?
+  end
+  
+  def test_validates_inclusion_of_finds_custom_model_key_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:inclusion => 'custom message'}}}}}
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:inclusion => 'global message'}}
+
+    Topic.validates_inclusion_of :title, :in => %w(a b c)
+    @topic.valid?
+    assert_equal 'custom message', @topic.errors.on(:title)
+  end
+  
+  def test_validates_inclusion_of_finds_global_default_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:inclusion => 'global message'}}
+
+    Topic.validates_inclusion_of :title, :in => %w(a b c)
+    @topic.valid?
+    assert_equal 'global message', @topic.errors.on(:title)
+  end
+  
+  
+  # validates_exclusion_of
+  
+  def test_validates_exclusion_of_generates_message
+    Topic.validates_exclusion_of :title, :in => %w(a b c)
+    @topic.title = 'a'
+    @topic.errors.expects(:generate_message).with(:title, :exclusion, {:value => 'a', :default => nil})
+    @topic.valid?
+  end
+  
+  def test_validates_exclusion_of_generates_message_with_custom_default_message
+    Topic.validates_exclusion_of :title, :in => %w(a b c), :message => 'custom'
+    @topic.title = 'a'
+    @topic.errors.expects(:generate_message).with(:title, :exclusion, {:value => 'a', :default => 'custom'})
+    @topic.valid?
+  end
+  
+  def test_validates_exclusion_of_finds_custom_model_key_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:exclusion => 'custom message'}}}}}
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:exclusion => 'global message'}}
+
+    Topic.validates_exclusion_of :title, :in => %w(a b c)
+    @topic.title = 'a'
+    @topic.valid?
+    assert_equal 'custom message', @topic.errors.on(:title)
+  end
+  
+  def test_validates_exclusion_of_finds_global_default_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:exclusion => 'global message'}}
+
+    Topic.validates_exclusion_of :title, :in => %w(a b c)
+    @topic.title = 'a'
+    @topic.valid?
+    assert_equal 'global message', @topic.errors.on(:title)
+  end
+  
+  
+  # validates_numericality_of :only_integer
+  
+  def test_validates_numericality_of_only_integer_generates_message
+    Topic.validates_numericality_of :title, :only_integer => true
+    @topic.title = 'a'
+    @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => nil})
+    @topic.valid?
+  end
+  
+  def test_validates_numericality_of_only_integer_generates_message_with_custom_default_message
+    Topic.validates_numericality_of :title, :only_integer => true, :message => 'custom'
+    @topic.title = 'a'
+    @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => 'custom'})
+    @topic.valid?
+  end
+  
+  def test_validates_numericality_of_only_integer_finds_custom_model_key_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:not_a_number => 'custom message'}}}}}
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:not_a_number => 'global message'}}
+
+    Topic.validates_numericality_of :title, :only_integer => true
+    @topic.title = 'a'
+    @topic.valid?
+    assert_equal 'custom message', @topic.errors.on(:title)
+  end
+  
+  def test_validates_numericality_of_only_integer_finds_global_default_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:not_a_number => 'global message'}}
+
+    Topic.validates_numericality_of :title, :only_integer => true
+    @topic.title = 'a'
+    @topic.valid?
+    assert_equal 'global message', @topic.errors.on(:title)
+  end
+  
+  
+  # validates_numericality_of :odd
+  
+  def test_validates_numericality_of_odd_generates_message
+    Topic.validates_numericality_of :title, :only_integer => true, :odd => true
+    @topic.title = 0
+    @topic.errors.expects(:generate_message).with(:title, :odd, {:value => 0, :default => nil})
+    @topic.valid?
+  end
+  
+  def test_validates_numericality_of_odd_generates_message_with_custom_default_message
+    Topic.validates_numericality_of :title, :only_integer => true, :odd => true, :message => 'custom'
+    @topic.title = 0
+    @topic.errors.expects(:generate_message).with(:title, :odd, {:value => 0, :default => 'custom'})
+    @topic.valid?
+  end
+  
+  def test_validates_numericality_of_odd_finds_custom_model_key_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:odd => 'custom message'}}}}}
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:odd => 'global message'}}
+
+    Topic.validates_numericality_of :title, :only_integer => true, :odd => true
+    @topic.title = 0
+    @topic.valid?
+    assert_equal 'custom message', @topic.errors.on(:title)
+  end
+  
+  def test_validates_numericality_of_odd_finds_global_default_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:odd => 'global message'}}
+
+    Topic.validates_numericality_of :title, :only_integer => true, :odd => true
+    @topic.title = 0
+    @topic.valid?
+    assert_equal 'global message', @topic.errors.on(:title)
+  end
+  
+  
+  # validates_numericality_of :less_than
+  
+  def test_validates_numericality_of_less_than_generates_message
+    Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
+    @topic.title = 1
+    @topic.errors.expects(:generate_message).with(:title, :less_than, {:value => 1, :count => 0, :default => nil})
+    @topic.valid?
+  end
+  
+  def test_validates_numericality_of_odd_generates_message_with_custom_default_message
+    Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0, :message => 'custom'
+    @topic.title = 1
+    @topic.errors.expects(:generate_message).with(:title, :less_than, {:value => 1, :count => 0, :default => 'custom'})
+    @topic.valid?
+  end
+  
+  def test_validates_numericality_of_less_than_finds_custom_model_key_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:less_than => 'custom message'}}}}}
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:less_than => 'global message'}}
+
+    Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
+    @topic.title = 1
+    @topic.valid?
+    assert_equal 'custom message', @topic.errors.on(:title)
+  end
+  
+  def test_validates_numericality_of_less_than_finds_global_default_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:less_than => 'global message'}}
+
+    Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
+    @topic.title = 1
+    @topic.valid?
+    assert_equal 'global message', @topic.errors.on(:title)
+  end
+  
+  
+  # validates_associated
+  
+  def test_validates_associated_generates_message
+    Topic.validates_associated :replies
+    replied_topic.errors.expects(:generate_message).with(:replies, :invalid, {:value => replied_topic.replies, :default => nil})
+    replied_topic.valid?
+  end
+  
+  def test_validates_associated_generates_message_with_custom_default_message
+    Topic.validates_associated :replies
+    replied_topic.errors.expects(:generate_message).with(:replies, :invalid, {:value => replied_topic.replies, :default => nil})
+    replied_topic.valid?
+  end
+  
+  def test_validates_associated_finds_custom_model_key_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:replies => {:invalid => 'custom message'}}}}}
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
+
+    Topic.validates_associated :replies
+    replied_topic.valid?
+    assert_equal 'custom message', replied_topic.errors.on(:replies)
+  end
+  
+  def test_validates_associated_finds_global_default_translation
+    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
+
+    Topic.validates_associated :replies
+    replied_topic.valid?
+    assert_equal 'global message', replied_topic.errors.on(:replies)
+  end
+end
\ No newline at end of file
-- 
cgit v1.2.3


From 585c8c17c303fc46fcf014a644a541eae6cb5ffd Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Fri, 20 Jun 2008 09:13:20 +0200
Subject: rename Backend::Simple#add_translations to set_translations because
 it overwrites existing translations

---
 activerecord/test/cases/validations_i18n_test.rb | 80 ++++++++++++------------
 1 file changed, 40 insertions(+), 40 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index eb454fca20..8f8574c242 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -6,7 +6,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   def setup
     reset_callbacks Topic
     @topic = Topic.new
-    I18n.backend.add_translations('en-US', :active_record => {:error_messages => {:custom => nil}})
+    I18n.backend.set_translations('en-US', :active_record => {:error_messages => {:custom => nil}})
   end
   
   def teardown
@@ -113,8 +113,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_confirmation_of_finds_custom_model_key_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:confirmation => 'custom message'}}}}}
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:confirmation => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:confirmation => 'custom message'}}}}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:confirmation => 'global message'}}
 
     Topic.validates_confirmation_of :title
     @topic.title_confirmation = 'foo'
@@ -123,7 +123,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_confirmation_of_finds_global_default_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:confirmation => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:confirmation => 'global message'}}
 
     Topic.validates_confirmation_of :title
     @topic.title_confirmation = 'foo'
@@ -147,8 +147,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_acceptance_of_finds_custom_model_key_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:accepted => 'custom message'}}}}}
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:accepted => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:accepted => 'custom message'}}}}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:accepted => 'global message'}}
 
     Topic.validates_acceptance_of :title, :allow_nil => false
     @topic.valid?
@@ -156,7 +156,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_acceptance_of_finds_global_default_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:accepted => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:accepted => 'global message'}}
 
     Topic.validates_acceptance_of :title, :allow_nil => false
     @topic.valid?
@@ -179,8 +179,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_presence_of_finds_custom_model_key_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:blank => 'custom message'}}}}}
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:blank => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:blank => 'custom message'}}}}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:blank => 'global message'}}
 
     Topic.validates_presence_of :title
     @topic.valid?
@@ -188,7 +188,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_presence_of_finds_global_default_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:blank => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:blank => 'global message'}}
 
     Topic.validates_presence_of :title
     @topic.valid?
@@ -211,8 +211,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_length_of_within_finds_custom_model_key_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:too_short => 'custom message'}}}}}
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:too_short => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:too_short => 'custom message'}}}}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:too_short => 'global message'}}
 
     Topic.validates_length_of :title, :within => 3..5
     @topic.valid?
@@ -220,7 +220,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_length_of_within_finds_global_default_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:too_short => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:too_short => 'global message'}}
 
     Topic.validates_length_of :title, :within => 3..5
     @topic.valid?
@@ -243,8 +243,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_length_of_within_finds_custom_model_key_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
 
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
@@ -252,7 +252,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_length_of_within_finds_global_default_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
 
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
@@ -277,8 +277,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_length_of_within_finds_custom_model_key_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
 
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
@@ -286,7 +286,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_length_of_within_finds_global_default_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
 
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
@@ -311,8 +311,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_format_of_finds_custom_model_key_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:invalid => 'custom message'}}}}}
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:invalid => 'custom message'}}}}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
 
     Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
     @topic.valid?
@@ -320,7 +320,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_format_of_finds_global_default_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
 
     Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
     @topic.valid?
@@ -345,8 +345,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_inclusion_of_finds_custom_model_key_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:inclusion => 'custom message'}}}}}
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:inclusion => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:inclusion => 'custom message'}}}}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:inclusion => 'global message'}}
 
     Topic.validates_inclusion_of :title, :in => %w(a b c)
     @topic.valid?
@@ -354,7 +354,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_inclusion_of_finds_global_default_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:inclusion => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:inclusion => 'global message'}}
 
     Topic.validates_inclusion_of :title, :in => %w(a b c)
     @topic.valid?
@@ -379,8 +379,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_exclusion_of_finds_custom_model_key_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:exclusion => 'custom message'}}}}}
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:exclusion => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:exclusion => 'custom message'}}}}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:exclusion => 'global message'}}
 
     Topic.validates_exclusion_of :title, :in => %w(a b c)
     @topic.title = 'a'
@@ -389,7 +389,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_exclusion_of_finds_global_default_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:exclusion => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:exclusion => 'global message'}}
 
     Topic.validates_exclusion_of :title, :in => %w(a b c)
     @topic.title = 'a'
@@ -415,8 +415,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_numericality_of_only_integer_finds_custom_model_key_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:not_a_number => 'custom message'}}}}}
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:not_a_number => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:not_a_number => 'custom message'}}}}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:not_a_number => 'global message'}}
 
     Topic.validates_numericality_of :title, :only_integer => true
     @topic.title = 'a'
@@ -425,7 +425,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_numericality_of_only_integer_finds_global_default_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:not_a_number => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:not_a_number => 'global message'}}
 
     Topic.validates_numericality_of :title, :only_integer => true
     @topic.title = 'a'
@@ -451,8 +451,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_numericality_of_odd_finds_custom_model_key_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:odd => 'custom message'}}}}}
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:odd => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:odd => 'custom message'}}}}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:odd => 'global message'}}
 
     Topic.validates_numericality_of :title, :only_integer => true, :odd => true
     @topic.title = 0
@@ -461,7 +461,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_numericality_of_odd_finds_global_default_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:odd => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:odd => 'global message'}}
 
     Topic.validates_numericality_of :title, :only_integer => true, :odd => true
     @topic.title = 0
@@ -487,8 +487,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_numericality_of_less_than_finds_custom_model_key_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:less_than => 'custom message'}}}}}
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:less_than => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:less_than => 'custom message'}}}}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:less_than => 'global message'}}
 
     Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
     @topic.title = 1
@@ -497,7 +497,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_numericality_of_less_than_finds_global_default_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:less_than => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:less_than => 'global message'}}
 
     Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
     @topic.title = 1
@@ -521,8 +521,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_associated_finds_custom_model_key_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:replies => {:invalid => 'custom message'}}}}}
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:replies => {:invalid => 'custom message'}}}}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
 
     Topic.validates_associated :replies
     replied_topic.valid?
@@ -530,7 +530,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_associated_finds_global_default_translation
-    I18n.backend.add_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
+    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
 
     Topic.validates_associated :replies
     replied_topic.valid?
-- 
cgit v1.2.3


From c1e2506494107892a0962b8491cd234f77949c08 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Sat, 21 Jun 2008 11:27:19 +0200
Subject: Changed process of storing translations from the client libraries to
 the backend: clients now can pass a block to backend#populate which can
 contain code to load and register translations.

This makes sense for backends that persist their translations (e.g. to db)
so the repeated loading and passing of translations throughout the server
startup would be wasted resources.
---
 activerecord/test/cases/validations_i18n_test.rb | 80 ++++++++++++------------
 1 file changed, 40 insertions(+), 40 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index 8f8574c242..de844bf5a6 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -6,7 +6,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   def setup
     reset_callbacks Topic
     @topic = Topic.new
-    I18n.backend.set_translations('en-US', :active_record => {:error_messages => {:custom => nil}})
+    I18n.backend.store_translations('en-US', :active_record => {:error_messages => {:custom => nil}})
   end
   
   def teardown
@@ -113,8 +113,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_confirmation_of_finds_custom_model_key_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:confirmation => 'custom message'}}}}}
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:confirmation => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:confirmation => 'custom message'}}}}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:confirmation => 'global message'}}
 
     Topic.validates_confirmation_of :title
     @topic.title_confirmation = 'foo'
@@ -123,7 +123,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_confirmation_of_finds_global_default_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:confirmation => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:confirmation => 'global message'}}
 
     Topic.validates_confirmation_of :title
     @topic.title_confirmation = 'foo'
@@ -147,8 +147,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_acceptance_of_finds_custom_model_key_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:accepted => 'custom message'}}}}}
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:accepted => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:accepted => 'custom message'}}}}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:accepted => 'global message'}}
 
     Topic.validates_acceptance_of :title, :allow_nil => false
     @topic.valid?
@@ -156,7 +156,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_acceptance_of_finds_global_default_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:accepted => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:accepted => 'global message'}}
 
     Topic.validates_acceptance_of :title, :allow_nil => false
     @topic.valid?
@@ -179,8 +179,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_presence_of_finds_custom_model_key_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:blank => 'custom message'}}}}}
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:blank => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:blank => 'custom message'}}}}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:blank => 'global message'}}
 
     Topic.validates_presence_of :title
     @topic.valid?
@@ -188,7 +188,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_presence_of_finds_global_default_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:blank => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:blank => 'global message'}}
 
     Topic.validates_presence_of :title
     @topic.valid?
@@ -211,8 +211,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_length_of_within_finds_custom_model_key_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:too_short => 'custom message'}}}}}
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:too_short => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:too_short => 'custom message'}}}}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:too_short => 'global message'}}
 
     Topic.validates_length_of :title, :within => 3..5
     @topic.valid?
@@ -220,7 +220,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_length_of_within_finds_global_default_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:too_short => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:too_short => 'global message'}}
 
     Topic.validates_length_of :title, :within => 3..5
     @topic.valid?
@@ -243,8 +243,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_length_of_within_finds_custom_model_key_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
 
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
@@ -252,7 +252,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_length_of_within_finds_global_default_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
 
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
@@ -277,8 +277,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_length_of_within_finds_custom_model_key_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
 
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
@@ -286,7 +286,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_length_of_within_finds_global_default_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
 
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
@@ -311,8 +311,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_format_of_finds_custom_model_key_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:invalid => 'custom message'}}}}}
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:invalid => 'custom message'}}}}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
 
     Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
     @topic.valid?
@@ -320,7 +320,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_format_of_finds_global_default_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
 
     Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
     @topic.valid?
@@ -345,8 +345,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_inclusion_of_finds_custom_model_key_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:inclusion => 'custom message'}}}}}
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:inclusion => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:inclusion => 'custom message'}}}}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:inclusion => 'global message'}}
 
     Topic.validates_inclusion_of :title, :in => %w(a b c)
     @topic.valid?
@@ -354,7 +354,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_inclusion_of_finds_global_default_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:inclusion => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:inclusion => 'global message'}}
 
     Topic.validates_inclusion_of :title, :in => %w(a b c)
     @topic.valid?
@@ -379,8 +379,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_exclusion_of_finds_custom_model_key_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:exclusion => 'custom message'}}}}}
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:exclusion => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:exclusion => 'custom message'}}}}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:exclusion => 'global message'}}
 
     Topic.validates_exclusion_of :title, :in => %w(a b c)
     @topic.title = 'a'
@@ -389,7 +389,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_exclusion_of_finds_global_default_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:exclusion => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:exclusion => 'global message'}}
 
     Topic.validates_exclusion_of :title, :in => %w(a b c)
     @topic.title = 'a'
@@ -415,8 +415,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_numericality_of_only_integer_finds_custom_model_key_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:not_a_number => 'custom message'}}}}}
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:not_a_number => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:not_a_number => 'custom message'}}}}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:not_a_number => 'global message'}}
 
     Topic.validates_numericality_of :title, :only_integer => true
     @topic.title = 'a'
@@ -425,7 +425,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_numericality_of_only_integer_finds_global_default_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:not_a_number => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:not_a_number => 'global message'}}
 
     Topic.validates_numericality_of :title, :only_integer => true
     @topic.title = 'a'
@@ -451,8 +451,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_numericality_of_odd_finds_custom_model_key_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:odd => 'custom message'}}}}}
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:odd => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:odd => 'custom message'}}}}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:odd => 'global message'}}
 
     Topic.validates_numericality_of :title, :only_integer => true, :odd => true
     @topic.title = 0
@@ -461,7 +461,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_numericality_of_odd_finds_global_default_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:odd => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:odd => 'global message'}}
 
     Topic.validates_numericality_of :title, :only_integer => true, :odd => true
     @topic.title = 0
@@ -487,8 +487,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_numericality_of_less_than_finds_custom_model_key_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:less_than => 'custom message'}}}}}
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:less_than => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:less_than => 'custom message'}}}}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:less_than => 'global message'}}
 
     Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
     @topic.title = 1
@@ -497,7 +497,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_numericality_of_less_than_finds_global_default_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:less_than => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:less_than => 'global message'}}
 
     Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
     @topic.title = 1
@@ -521,8 +521,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_associated_finds_custom_model_key_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:replies => {:invalid => 'custom message'}}}}}
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:replies => {:invalid => 'custom message'}}}}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
 
     Topic.validates_associated :replies
     replied_topic.valid?
@@ -530,7 +530,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_associated_finds_global_default_translation
-    I18n.backend.set_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
 
     Topic.validates_associated :replies
     replied_topic.valid?
-- 
cgit v1.2.3


From 428aa24d24032d382dc3d9ccf131e0c874043dbd Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Sat, 21 Jun 2008 11:35:02 +0200
Subject: Renamed lang/ to locale/ because that's what we seem to standarize
 on. Also, in future this place can be used for data/code that's not literally
 translations but conceptually belongs to the locale (like custom
 pluralization algorithms etc.).

---
 activerecord/test/cases/validations_i18n_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index de844bf5a6..10e36b1512 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -11,7 +11,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   def teardown
     reset_callbacks Topic
-    load 'active_record/lang/en-US.rb'
+    load 'active_record/locale/en-US.rb'
   end
   
   def unique_topic
-- 
cgit v1.2.3


From 8bfdabbd8b5137f91d8bcddc8c3d18961c8e316b Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Sat, 21 Jun 2008 17:50:37 +0200
Subject: incorporate #translate usage with several default keys (use first
 default key that resolves to a translation). this might, depending on the
 backend implementation save some expensive lookups (like db lookups)

---
 activerecord/test/cases/validations_i18n_test.rb | 86 ++++++++++--------------
 1 file changed, 35 insertions(+), 51 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index 10e36b1512..37a7c1ce49 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -40,31 +40,15 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     global_scope = [:active_record, :error_messages]
     custom_scope = global_scope + [:custom, 'topic', :title]
     
-    I18n.expects(:translate).with(:invalid, :scope => custom_scope).returns 'translation'
-    I18n.expects(:translate).with(:invalid, :scope => global_scope).never
-    
-    @topic.errors.generate_message :title, :invalid
+    I18n.expects(:t).with :scope => [:active_record, :error_messages], :default => [:"custom.topic.title.invalid", 'default from class def', :invalid]
+    @topic.errors.generate_message :title, :invalid, :default => 'default from class def'
   end
   
-  def test_errors_generate_message_given_a_custom_message_translates_custom_model_attribute_key_with_custom_message_as_default
+  def test_errors_generate_message_translates_custom_model_attribute_keys_with_sti
     custom_scope = [:active_record, :error_messages, :custom, 'topic', :title]
     
-    I18n.expects(:translate).with(:invalid, :scope => custom_scope, :default => 'default from class def').returns 'translation'
-    @topic.errors.generate_message :title, :invalid, :default => 'default from class def'
-  end
-  
-  def test_errors_generate_message_given_no_custom_message_falls_back_to_global_default_key_translation
-    global_scope = [:active_record, :error_messages]
-    custom_scope = global_scope + [:custom, 'topic', :title]
-
-    I18n.stubs(:translate).with(:invalid, :scope => custom_scope).returns nil
-    I18n.expects(:translate).with(:invalid, :scope => global_scope)
-    @topic.errors.generate_message :title, :invalid
-  end
-  
-  def test_errors_add_given_no_message_it_translates_invalid
-    I18n.expects(:translate).with(:"active_record.error_messages.invalid")
-    @topic.errors.add :title
+    I18n.expects(:t).with :scope => [:active_record, :error_messages], :default => [:"custom.reply.title.invalid", :"custom.topic.title.invalid", 'default from class def', :invalid]
+    Reply.new.errors.generate_message :title, :invalid, :default => 'default from class def'
   end
   
   def test_errors_add_on_empty_generates_message
@@ -115,7 +99,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   def test_validates_confirmation_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:confirmation => 'custom message'}}}}}
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:confirmation => 'global message'}}
-
+  
     Topic.validates_confirmation_of :title
     @topic.title_confirmation = 'foo'
     @topic.valid?
@@ -124,7 +108,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   def test_validates_confirmation_of_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:confirmation => 'global message'}}
-
+  
     Topic.validates_confirmation_of :title
     @topic.title_confirmation = 'foo'
     @topic.valid?
@@ -133,13 +117,13 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   
   # validates_acceptance_of
-
+  
   def test_validates_acceptance_of_generates_message
     Topic.validates_acceptance_of :title, :allow_nil => false
     @topic.errors.expects(:generate_message).with(:title, :accepted, {:default => nil})
     @topic.valid?
   end
-
+  
   def test_validates_acceptance_of_generates_message_with_custom_default_message
     Topic.validates_acceptance_of :title, :message => 'custom', :allow_nil => false
     @topic.errors.expects(:generate_message).with(:title, :accepted, {:default => 'custom'})
@@ -149,7 +133,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   def test_validates_acceptance_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:accepted => 'custom message'}}}}}
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:accepted => 'global message'}}
-
+  
     Topic.validates_acceptance_of :title, :allow_nil => false
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
@@ -157,7 +141,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   def test_validates_acceptance_of_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:accepted => 'global message'}}
-
+  
     Topic.validates_acceptance_of :title, :allow_nil => false
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
@@ -165,7 +149,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   
   # validates_presence_of
-
+  
   def test_validates_presence_of_generates_message
     Topic.validates_presence_of :title
     @topic.errors.expects(:generate_message).with(:title, :blank, {:default => nil})
@@ -181,7 +165,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   def test_validates_presence_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:blank => 'custom message'}}}}}
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:blank => 'global message'}}
-
+  
     Topic.validates_presence_of :title
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
@@ -189,7 +173,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   def test_validates_presence_of_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:blank => 'global message'}}
-
+  
     Topic.validates_presence_of :title
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
@@ -197,7 +181,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   
   # validates_length_of :within
-
+  
   def test_validates_length_of_within_generates_message
     Topic.validates_length_of :title, :within => 3..5
     @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => nil})
@@ -213,7 +197,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   def test_validates_length_of_within_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:too_short => 'custom message'}}}}}
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:too_short => 'global message'}}
-
+  
     Topic.validates_length_of :title, :within => 3..5
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
@@ -221,7 +205,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   def test_validates_length_of_within_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:too_short => 'global message'}}
-
+  
     Topic.validates_length_of :title, :within => 3..5
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
@@ -245,7 +229,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   def test_validates_length_of_within_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
-
+  
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
@@ -253,7 +237,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   def test_validates_length_of_within_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
-
+  
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
@@ -279,7 +263,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   def test_validates_length_of_within_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
-
+  
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
@@ -287,7 +271,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   def test_validates_length_of_within_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
-
+  
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
@@ -313,7 +297,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   def test_validates_format_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:invalid => 'custom message'}}}}}
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
-
+  
     Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
@@ -321,7 +305,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   def test_validates_format_of_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
-
+  
     Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
@@ -347,7 +331,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   def test_validates_inclusion_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:inclusion => 'custom message'}}}}}
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:inclusion => 'global message'}}
-
+  
     Topic.validates_inclusion_of :title, :in => %w(a b c)
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
@@ -355,7 +339,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   def test_validates_inclusion_of_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:inclusion => 'global message'}}
-
+  
     Topic.validates_inclusion_of :title, :in => %w(a b c)
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
@@ -381,7 +365,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   def test_validates_exclusion_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:exclusion => 'custom message'}}}}}
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:exclusion => 'global message'}}
-
+  
     Topic.validates_exclusion_of :title, :in => %w(a b c)
     @topic.title = 'a'
     @topic.valid?
@@ -390,7 +374,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   def test_validates_exclusion_of_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:exclusion => 'global message'}}
-
+  
     Topic.validates_exclusion_of :title, :in => %w(a b c)
     @topic.title = 'a'
     @topic.valid?
@@ -417,7 +401,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   def test_validates_numericality_of_only_integer_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:not_a_number => 'custom message'}}}}}
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:not_a_number => 'global message'}}
-
+  
     Topic.validates_numericality_of :title, :only_integer => true
     @topic.title = 'a'
     @topic.valid?
@@ -426,7 +410,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   def test_validates_numericality_of_only_integer_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:not_a_number => 'global message'}}
-
+  
     Topic.validates_numericality_of :title, :only_integer => true
     @topic.title = 'a'
     @topic.valid?
@@ -453,7 +437,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   def test_validates_numericality_of_odd_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:odd => 'custom message'}}}}}
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:odd => 'global message'}}
-
+  
     Topic.validates_numericality_of :title, :only_integer => true, :odd => true
     @topic.title = 0
     @topic.valid?
@@ -462,7 +446,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   def test_validates_numericality_of_odd_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:odd => 'global message'}}
-
+  
     Topic.validates_numericality_of :title, :only_integer => true, :odd => true
     @topic.title = 0
     @topic.valid?
@@ -489,7 +473,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   def test_validates_numericality_of_less_than_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:less_than => 'custom message'}}}}}
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:less_than => 'global message'}}
-
+  
     Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
     @topic.title = 1
     @topic.valid?
@@ -498,7 +482,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   def test_validates_numericality_of_less_than_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:less_than => 'global message'}}
-
+  
     Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
     @topic.title = 1
     @topic.valid?
@@ -523,7 +507,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   def test_validates_associated_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:replies => {:invalid => 'custom message'}}}}}
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
-
+  
     Topic.validates_associated :replies
     replied_topic.valid?
     assert_equal 'custom message', replied_topic.errors.on(:replies)
@@ -531,7 +515,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   def test_validates_associated_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
-
+  
     Topic.validates_associated :replies
     replied_topic.valid?
     assert_equal 'global message', replied_topic.errors.on(:replies)
-- 
cgit v1.2.3


From 0dddba41fcfcd28de2ce1a88a23514fbde53afcf Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Mon, 23 Jun 2008 14:33:29 +0200
Subject: rather cosmetic improvements of test coverage

---
 activerecord/test/cases/validations_i18n_test.rb | 62 ++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 3 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index 37a7c1ce49..158ff69e57 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -34,6 +34,12 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     end
   end
   
+  def test_default_error_messages_is_deprecated
+    assert_deprecated('ActiveRecord::Errors.default_error_messages') do
+      ActiveRecord::Errors.default_error_messages
+    end
+  end
+  
   # ActiveRecord::Errors
   
   def test_errors_generate_message_translates_custom_model_attribute_key
@@ -182,18 +188,32 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   # validates_length_of :within
   
-  def test_validates_length_of_within_generates_message
+  def test_validates_length_of_within_generates_message_with_title_too_short
     Topic.validates_length_of :title, :within => 3..5
     @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => nil})
     @topic.valid?
   end
   
-  def test_validates_length_of_within_generates_message_with_custom_default_message
+  def test_validates_length_of_within_generates_message_with_title_too_short_and_custom_default_message
     Topic.validates_length_of :title, :within => 3..5, :too_short => 'custom'
     @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => 'custom'})
     @topic.valid?
   end
   
+  def test_validates_length_of_within_generates_message_with_title_too_long
+    Topic.validates_length_of :title, :within => 3..5
+    @topic.title = 'this title is too long'
+    @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => nil})
+    @topic.valid?
+  end
+  
+  def test_validates_length_of_within_generates_message_with_title_too_long_and_custom_default_message
+    Topic.validates_length_of :title, :within => 3..5, :too_long => 'custom'
+    @topic.title = 'this title is too long'
+    @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => 'custom'})
+    @topic.valid?
+  end
+  
   def test_validates_length_of_within_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:too_short => 'custom message'}}}}}
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:too_short => 'global message'}}
@@ -382,7 +402,43 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   
-  # validates_numericality_of :only_integer
+  # validates_numericality_of without :only_integer
+  
+  def test_validates_numericality_of_generates_message
+    Topic.validates_numericality_of :title
+    @topic.title = 'a'
+    @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => nil})
+    @topic.valid?
+  end
+  
+  def test_validates_numericality_of_generates_message_with_custom_default_message
+    Topic.validates_numericality_of :title, :message => 'custom'
+    @topic.title = 'a'
+    @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => 'custom'})
+    @topic.valid?
+  end
+  
+  def test_validates_numericality_of_finds_custom_model_key_translation
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:not_a_number => 'custom message'}}}}}
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:not_a_number => 'global message'}}
+  
+    Topic.validates_numericality_of :title
+    @topic.title = 'a'
+    @topic.valid?
+    assert_equal 'custom message', @topic.errors.on(:title)
+  end
+  
+  def test_validates_numericality_of_finds_global_default_translation
+    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:not_a_number => 'global message'}}
+  
+    Topic.validates_numericality_of :title, :only_integer => true
+    @topic.title = 'a'
+    @topic.valid?
+    assert_equal 'global message', @topic.errors.on(:title)
+  end
+  
+  
+  # validates_numericality_of with :only_integer
   
   def test_validates_numericality_of_only_integer_generates_message
     Topic.validates_numericality_of :title, :only_integer => true
-- 
cgit v1.2.3


From 8461526f346b8d8387ba3b74221fbeefef3aefeb Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Mon, 23 Jun 2008 14:55:07 +0200
Subject: silence deprecation warning during validations test

---
 activerecord/test/cases/validations_test.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_test.rb b/activerecord/test/cases/validations_test.rb
index 7b71647d25..ad27ac951c 100755
--- a/activerecord/test/cases/validations_test.rb
+++ b/activerecord/test/cases/validations_test.rb
@@ -853,7 +853,9 @@ class ValidationsTest < ActiveRecord::TestCase
   end
 
   def test_validates_length_with_globally_modified_error_message
-    ActiveRecord::Errors.default_error_messages[:too_short] = 'tu est trops petit hombre %d'
+    ActiveSupport::Deprecation.silence do
+      ActiveRecord::Errors.default_error_messages[:too_short] = 'tu est trops petit hombre %d'
+    end
     Topic.validates_length_of :title, :minimum => 10
     t = Topic.create(:title => 'too short')
     assert !t.valid?
-- 
cgit v1.2.3


From 66c2508ebbca06e551255a76cc47a1608f091992 Mon Sep 17 00:00:00 2001
From: Luca Guidi <guidi.luca@gmail.com>
Date: Fri, 27 Jun 2008 15:00:55 +0200
Subject: Make sure mocha is available

---
 activerecord/test/cases/validations_i18n_test.rb | 576 ++++++++++++-----------
 1 file changed, 310 insertions(+), 266 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index 158ff69e57..53e90f4d53 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -41,66 +41,307 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   # ActiveRecord::Errors
+  uses_mocha 'ActiveRecord::Errors' do
+    def test_errors_generate_message_translates_custom_model_attribute_key
+      global_scope = [:active_record, :error_messages]
+      custom_scope = global_scope + [:custom, 'topic', :title]
+
+      I18n.expects(:t).with :scope => [:active_record, :error_messages], :default => [:"custom.topic.title.invalid", 'default from class def', :invalid]
+      @topic.errors.generate_message :title, :invalid, :default => 'default from class def'
+    end
+
+    def test_errors_generate_message_translates_custom_model_attribute_keys_with_sti
+      custom_scope = [:active_record, :error_messages, :custom, 'topic', :title]
+
+      I18n.expects(:t).with :scope => [:active_record, :error_messages], :default => [:"custom.reply.title.invalid", :"custom.topic.title.invalid", 'default from class def', :invalid]
+      Reply.new.errors.generate_message :title, :invalid, :default => 'default from class def'
+    end
+
+    def test_errors_add_on_empty_generates_message
+      @topic.errors.expects(:generate_message).with(:title, :empty, {:default => nil})
+      @topic.errors.add_on_empty :title
+    end
+
+    def test_errors_add_on_empty_generates_message_with_custom_default_message
+      @topic.errors.expects(:generate_message).with(:title, :empty, {:default => 'custom'})
+      @topic.errors.add_on_empty :title, 'custom'
+    end
+
+    def test_errors_add_on_blank_generates_message
+      @topic.errors.expects(:generate_message).with(:title, :blank, {:default => nil})
+      @topic.errors.add_on_blank :title
+    end
+
+    def test_errors_add_on_blank_generates_message_with_custom_default_message
+      @topic.errors.expects(:generate_message).with(:title, :blank, {:default => 'custom'})
+      @topic.errors.add_on_blank :title, 'custom'
+    end
+
+    def test_errors_full_messages_translates_human_attribute_name_for_model_attributes
+      @topic.errors.instance_variable_set :@errors, { 'title' => 'empty' }
+      I18n.expects(:translate).with(:"active_record.human_attribute_names.topic.title", 'en-US').returns('Title')
+      @topic.errors.full_messages :locale => 'en-US'
+    end
+  end  
   
-  def test_errors_generate_message_translates_custom_model_attribute_key
-    global_scope = [:active_record, :error_messages]
-    custom_scope = global_scope + [:custom, 'topic', :title]
+  # ActiveRecord::Validations
+  uses_mocha 'ActiveRecord::Validations' do
+    # validates_confirmation_of w/ mocha
+
+    def test_validates_confirmation_of_generates_message
+      Topic.validates_confirmation_of :title
+      @topic.title_confirmation = 'foo'
+      @topic.errors.expects(:generate_message).with(:title, :confirmation, {:default => nil})
+      @topic.valid?
+    end
+
+    def test_validates_confirmation_of_generates_message_with_custom_default_message
+      Topic.validates_confirmation_of :title, :message => 'custom'
+      @topic.title_confirmation = 'foo'
+      @topic.errors.expects(:generate_message).with(:title, :confirmation, {:default => 'custom'})
+      @topic.valid?
+    end
     
-    I18n.expects(:t).with :scope => [:active_record, :error_messages], :default => [:"custom.topic.title.invalid", 'default from class def', :invalid]
-    @topic.errors.generate_message :title, :invalid, :default => 'default from class def'
-  end
-  
-  def test_errors_generate_message_translates_custom_model_attribute_keys_with_sti
-    custom_scope = [:active_record, :error_messages, :custom, 'topic', :title]
+    # validates_acceptance_of w/ mocha
+
+    def test_validates_acceptance_of_generates_message
+      Topic.validates_acceptance_of :title, :allow_nil => false
+      @topic.errors.expects(:generate_message).with(:title, :accepted, {:default => nil})
+      @topic.valid?
+    end
+
+    def test_validates_acceptance_of_generates_message_with_custom_default_message
+      Topic.validates_acceptance_of :title, :message => 'custom', :allow_nil => false
+      @topic.errors.expects(:generate_message).with(:title, :accepted, {:default => 'custom'})
+      @topic.valid?
+    end
     
-    I18n.expects(:t).with :scope => [:active_record, :error_messages], :default => [:"custom.reply.title.invalid", :"custom.topic.title.invalid", 'default from class def', :invalid]
-    Reply.new.errors.generate_message :title, :invalid, :default => 'default from class def'
-  end
-  
-  def test_errors_add_on_empty_generates_message
-    @topic.errors.expects(:generate_message).with(:title, :empty, {:default => nil})
-    @topic.errors.add_on_empty :title
-  end
-  
-  def test_errors_add_on_empty_generates_message_with_custom_default_message
-    @topic.errors.expects(:generate_message).with(:title, :empty, {:default => 'custom'})
-    @topic.errors.add_on_empty :title, 'custom'
-  end
-  
-  def test_errors_add_on_blank_generates_message
-    @topic.errors.expects(:generate_message).with(:title, :blank, {:default => nil})
-    @topic.errors.add_on_blank :title
-  end
-  
-  def test_errors_add_on_blank_generates_message_with_custom_default_message
-    @topic.errors.expects(:generate_message).with(:title, :blank, {:default => 'custom'})
-    @topic.errors.add_on_blank :title, 'custom'
-  end
-  
-  def test_errors_full_messages_translates_human_attribute_name_for_model_attributes
-    @topic.errors.instance_variable_set :@errors, { 'title' => 'empty' }
-    I18n.expects(:translate).with(:"active_record.human_attribute_names.topic.title", 'en-US').returns('Title')
-    @topic.errors.full_messages :locale => 'en-US'
-  end
-  
-  
-  # ActiveRecord::Validations
-  
-  # validates_confirmation_of
-  
-  def test_validates_confirmation_of_generates_message
-    Topic.validates_confirmation_of :title
-    @topic.title_confirmation = 'foo'
-    @topic.errors.expects(:generate_message).with(:title, :confirmation, {:default => nil})
-    @topic.valid?
+    # validates_presence_of w/ mocha
+    
+    def test_validates_presence_of_generates_message
+      Topic.validates_presence_of :title
+      @topic.errors.expects(:generate_message).with(:title, :blank, {:default => nil})
+      @topic.valid?
+    end
+
+    def test_validates_presence_of_generates_message_with_custom_default_message
+      Topic.validates_presence_of :title, :message => 'custom'
+      @topic.errors.expects(:generate_message).with(:title, :blank, {:default => 'custom'})
+      @topic.valid?
+    end
+    
+    def test_validates_length_of_within_generates_message_with_title_too_short
+      Topic.validates_length_of :title, :within => 3..5
+      @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => nil})
+      @topic.valid?
+    end
+
+    def test_validates_length_of_within_generates_message_with_title_too_short_and_custom_default_message
+      Topic.validates_length_of :title, :within => 3..5, :too_short => 'custom'
+      @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => 'custom'})
+      @topic.valid?
+    end
+
+    def test_validates_length_of_within_generates_message_with_title_too_long
+      Topic.validates_length_of :title, :within => 3..5
+      @topic.title = 'this title is too long'
+      @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => nil})
+      @topic.valid?
+    end
+
+    def test_validates_length_of_within_generates_message_with_title_too_long_and_custom_default_message
+      Topic.validates_length_of :title, :within => 3..5, :too_long => 'custom'
+      @topic.title = 'this title is too long'
+      @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => 'custom'})
+      @topic.valid?
+    end
+
+    # validates_length_of :within w/ mocha
+
+    def test_validates_length_of_within_generates_message_with_title_too_short
+      Topic.validates_length_of :title, :within => 3..5
+      @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => nil})
+      @topic.valid?
+    end
+
+    def test_validates_length_of_within_generates_message_with_title_too_short_and_custom_default_message
+      Topic.validates_length_of :title, :within => 3..5, :too_short => 'custom'
+      @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => 'custom'})
+      @topic.valid?
+    end
+
+    def test_validates_length_of_within_generates_message_with_title_too_long
+      Topic.validates_length_of :title, :within => 3..5
+      @topic.title = 'this title is too long'
+      @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => nil})
+      @topic.valid?
+    end
+
+    def test_validates_length_of_within_generates_message_with_title_too_long_and_custom_default_message
+      Topic.validates_length_of :title, :within => 3..5, :too_long => 'custom'
+      @topic.title = 'this title is too long'
+      @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => 'custom'})
+      @topic.valid?
+    end
+    
+    # validates_length_of :is w/ mocha
+
+    def test_validates_length_of_is_generates_message
+      Topic.validates_length_of :title, :is => 5
+      @topic.errors.expects(:generate_message).with(:title, :wrong_length, {:count => 5, :default => nil})
+      @topic.valid?
+    end
+
+    def test_validates_length_of_is_generates_message_with_custom_default_message
+      Topic.validates_length_of :title, :is => 5, :message => 'custom'
+      @topic.errors.expects(:generate_message).with(:title, :wrong_length, {:count => 5, :default => 'custom'})
+      @topic.valid?
+    end
+    
+    # validates_uniqueness_of w/ mocha
+
+    def test_validates_uniqueness_of_generates_message
+      Topic.validates_uniqueness_of :title
+      @topic.title = unique_topic.title
+      @topic.errors.expects(:generate_message).with(:title, :taken, {:default => nil})
+      @topic.valid?
+    end
+
+    def test_validates_uniqueness_of_generates_message_with_custom_default_message
+      Topic.validates_uniqueness_of :title, :message => 'custom'
+      @topic.title = unique_topic.title
+      @topic.errors.expects(:generate_message).with(:title, :taken, {:default => 'custom'})
+      @topic.valid?
+    end
+    
+    # validates_format_of w/ mocha
+
+    def test_validates_format_of_generates_message
+      Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
+      @topic.title = '72x'
+      @topic.errors.expects(:generate_message).with(:title, :invalid, {:value => '72x', :default => nil})
+      @topic.valid?
+    end
+
+    def test_validates_format_of_generates_message_with_custom_default_message
+      Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/, :message => 'custom'
+      @topic.title = '72x'
+      @topic.errors.expects(:generate_message).with(:title, :invalid, {:value => '72x', :default => 'custom'})
+      @topic.valid?
+    end
+    
+    # validates_inclusion_of w/ mocha
+
+    def test_validates_inclusion_of_generates_message
+      Topic.validates_inclusion_of :title, :in => %w(a b c)
+      @topic.title = 'z'
+      @topic.errors.expects(:generate_message).with(:title, :inclusion, {:value => 'z', :default => nil})
+      @topic.valid?
+    end
+
+    def test_validates_inclusion_of_generates_message_with_custom_default_message
+      Topic.validates_inclusion_of :title, :in => %w(a b c), :message => 'custom'
+      @topic.title = 'z'
+      @topic.errors.expects(:generate_message).with(:title, :inclusion, {:value => 'z', :default => 'custom'})
+      @topic.valid?
+    end
+    
+    # validates_exclusion_of w/ mocha
+
+    def test_validates_exclusion_of_generates_message
+      Topic.validates_exclusion_of :title, :in => %w(a b c)
+      @topic.title = 'a'
+      @topic.errors.expects(:generate_message).with(:title, :exclusion, {:value => 'a', :default => nil})
+      @topic.valid?
+    end
+
+    def test_validates_exclusion_of_generates_message_with_custom_default_message
+      Topic.validates_exclusion_of :title, :in => %w(a b c), :message => 'custom'
+      @topic.title = 'a'
+      @topic.errors.expects(:generate_message).with(:title, :exclusion, {:value => 'a', :default => 'custom'})
+      @topic.valid?
+    end
+    
+    # validates_numericality_of without :only_integer w/ mocha
+
+    def test_validates_numericality_of_generates_message
+      Topic.validates_numericality_of :title
+      @topic.title = 'a'
+      @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => nil})
+      @topic.valid?
+    end
+
+    def test_validates_numericality_of_generates_message_with_custom_default_message
+      Topic.validates_numericality_of :title, :message => 'custom'
+      @topic.title = 'a'
+      @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => 'custom'})
+      @topic.valid?
+    end
+    
+    # validates_numericality_of with :only_integer w/ mocha
+
+    def test_validates_numericality_of_only_integer_generates_message
+      Topic.validates_numericality_of :title, :only_integer => true
+      @topic.title = 'a'
+      @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => nil})
+      @topic.valid?
+    end
+
+    def test_validates_numericality_of_only_integer_generates_message_with_custom_default_message
+      Topic.validates_numericality_of :title, :only_integer => true, :message => 'custom'
+      @topic.title = 'a'
+      @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => 'custom'})
+      @topic.valid?
+    end
+    
+    # validates_numericality_of :odd w/ mocha
+
+    def test_validates_numericality_of_odd_generates_message
+      Topic.validates_numericality_of :title, :only_integer => true, :odd => true
+      @topic.title = 0
+      @topic.errors.expects(:generate_message).with(:title, :odd, {:value => 0, :default => nil})
+      @topic.valid?
+    end
+
+    def test_validates_numericality_of_odd_generates_message_with_custom_default_message
+      Topic.validates_numericality_of :title, :only_integer => true, :odd => true, :message => 'custom'
+      @topic.title = 0
+      @topic.errors.expects(:generate_message).with(:title, :odd, {:value => 0, :default => 'custom'})
+      @topic.valid?
+    end
+    
+    # validates_numericality_of :less_than w/ mocha
+
+    def test_validates_numericality_of_less_than_generates_message
+      Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
+      @topic.title = 1
+      @topic.errors.expects(:generate_message).with(:title, :less_than, {:value => 1, :count => 0, :default => nil})
+      @topic.valid?
+    end
+
+    def test_validates_numericality_of_odd_generates_message_with_custom_default_message
+      Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0, :message => 'custom'
+      @topic.title = 1
+      @topic.errors.expects(:generate_message).with(:title, :less_than, {:value => 1, :count => 0, :default => 'custom'})
+      @topic.valid?
+    end
+    
+    # validates_associated w/ mocha
+
+    def test_validates_associated_generates_message
+      Topic.validates_associated :replies
+      replied_topic.errors.expects(:generate_message).with(:replies, :invalid, {:value => replied_topic.replies, :default => nil})
+      replied_topic.valid?
+    end
+
+    def test_validates_associated_generates_message_with_custom_default_message
+      Topic.validates_associated :replies
+      replied_topic.errors.expects(:generate_message).with(:replies, :invalid, {:value => replied_topic.replies, :default => nil})
+      replied_topic.valid?
+    end
   end
   
-  def test_validates_confirmation_of_generates_message_with_custom_default_message
-    Topic.validates_confirmation_of :title, :message => 'custom'
-    @topic.title_confirmation = 'foo'
-    @topic.errors.expects(:generate_message).with(:title, :confirmation, {:default => 'custom'})
-    @topic.valid?
-  end
+  # validates_confirmation_of w/o mocha
   
   def test_validates_confirmation_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:confirmation => 'custom message'}}}}}
@@ -121,20 +362,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     assert_equal 'global message', @topic.errors.on(:title)
   end
   
-  
-  # validates_acceptance_of
-  
-  def test_validates_acceptance_of_generates_message
-    Topic.validates_acceptance_of :title, :allow_nil => false
-    @topic.errors.expects(:generate_message).with(:title, :accepted, {:default => nil})
-    @topic.valid?
-  end
-  
-  def test_validates_acceptance_of_generates_message_with_custom_default_message
-    Topic.validates_acceptance_of :title, :message => 'custom', :allow_nil => false
-    @topic.errors.expects(:generate_message).with(:title, :accepted, {:default => 'custom'})
-    @topic.valid?
-  end
+  # validates_acceptance_of w/o mocha
   
   def test_validates_acceptance_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:accepted => 'custom message'}}}}}
@@ -153,21 +381,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     assert_equal 'global message', @topic.errors.on(:title)
   end
   
-  
-  # validates_presence_of
-  
-  def test_validates_presence_of_generates_message
-    Topic.validates_presence_of :title
-    @topic.errors.expects(:generate_message).with(:title, :blank, {:default => nil})
-    @topic.valid?
-  end
-  
-  def test_validates_presence_of_generates_message_with_custom_default_message
-    Topic.validates_presence_of :title, :message => 'custom'
-    @topic.errors.expects(:generate_message).with(:title, :blank, {:default => 'custom'})
-    @topic.valid?
-  end
-  
+  # validates_presence_of w/o mocha
+    
   def test_validates_presence_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:blank => 'custom message'}}}}}
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:blank => 'global message'}}
@@ -185,34 +400,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     assert_equal 'global message', @topic.errors.on(:title)
   end
   
-  
-  # validates_length_of :within
-  
-  def test_validates_length_of_within_generates_message_with_title_too_short
-    Topic.validates_length_of :title, :within => 3..5
-    @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => nil})
-    @topic.valid?
-  end
-  
-  def test_validates_length_of_within_generates_message_with_title_too_short_and_custom_default_message
-    Topic.validates_length_of :title, :within => 3..5, :too_short => 'custom'
-    @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => 'custom'})
-    @topic.valid?
-  end
-  
-  def test_validates_length_of_within_generates_message_with_title_too_long
-    Topic.validates_length_of :title, :within => 3..5
-    @topic.title = 'this title is too long'
-    @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => nil})
-    @topic.valid?
-  end
-  
-  def test_validates_length_of_within_generates_message_with_title_too_long_and_custom_default_message
-    Topic.validates_length_of :title, :within => 3..5, :too_long => 'custom'
-    @topic.title = 'this title is too long'
-    @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => 'custom'})
-    @topic.valid?
-  end
+  # validates_length_of :within w/o mocha
   
   def test_validates_length_of_within_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:too_short => 'custom message'}}}}}
@@ -231,20 +419,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     assert_equal 'global message', @topic.errors.on(:title)
   end
   
-  
-  # validates_length_of :is
-  
-  def test_validates_length_of_is_generates_message
-    Topic.validates_length_of :title, :is => 5
-    @topic.errors.expects(:generate_message).with(:title, :wrong_length, {:count => 5, :default => nil})
-    @topic.valid?
-  end
-  
-  def test_validates_length_of_is_generates_message_with_custom_default_message
-    Topic.validates_length_of :title, :is => 5, :message => 'custom'
-    @topic.errors.expects(:generate_message).with(:title, :wrong_length, {:count => 5, :default => 'custom'})
-    @topic.valid?
-  end
+  # validates_length_of :is w/o mocha
   
   def test_validates_length_of_within_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}
@@ -263,22 +438,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     assert_equal 'global message', @topic.errors.on(:title)
   end
   
-  
-  # validates_uniqueness_of
-  
-  def test_validates_uniqueness_of_generates_message
-    Topic.validates_uniqueness_of :title
-    @topic.title = unique_topic.title
-    @topic.errors.expects(:generate_message).with(:title, :taken, {:default => nil})
-    @topic.valid?
-  end
-  
-  def test_validates_uniqueness_of_generates_message_with_custom_default_message
-    Topic.validates_uniqueness_of :title, :message => 'custom'
-    @topic.title = unique_topic.title
-    @topic.errors.expects(:generate_message).with(:title, :taken, {:default => 'custom'})
-    @topic.valid?
-  end
+  # validates_uniqueness_of w/o mocha
   
   def test_validates_length_of_within_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}
@@ -298,21 +458,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   
-  # validates_format_of
-  
-  def test_validates_format_of_generates_message
-    Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
-    @topic.title = '72x'
-    @topic.errors.expects(:generate_message).with(:title, :invalid, {:value => '72x', :default => nil})
-    @topic.valid?
-  end
-  
-  def test_validates_format_of_generates_message_with_custom_default_message
-    Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/, :message => 'custom'
-    @topic.title = '72x'
-    @topic.errors.expects(:generate_message).with(:title, :invalid, {:value => '72x', :default => 'custom'})
-    @topic.valid?
-  end
+  # validates_format_of w/o mocha
   
   def test_validates_format_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:invalid => 'custom message'}}}}}
@@ -331,22 +477,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     assert_equal 'global message', @topic.errors.on(:title)
   end
   
-  
-  # validates_inclusion_of
-  
-  def test_validates_inclusion_of_generates_message
-    Topic.validates_inclusion_of :title, :in => %w(a b c)
-    @topic.title = 'z'
-    @topic.errors.expects(:generate_message).with(:title, :inclusion, {:value => 'z', :default => nil})
-    @topic.valid?
-  end
-  
-  def test_validates_inclusion_of_generates_message_with_custom_default_message
-    Topic.validates_inclusion_of :title, :in => %w(a b c), :message => 'custom'
-    @topic.title = 'z'
-    @topic.errors.expects(:generate_message).with(:title, :inclusion, {:value => 'z', :default => 'custom'})
-    @topic.valid?
-  end
+  # validates_inclusion_of w/o mocha
   
   def test_validates_inclusion_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:inclusion => 'custom message'}}}}}
@@ -365,22 +496,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     assert_equal 'global message', @topic.errors.on(:title)
   end
   
-  
-  # validates_exclusion_of
-  
-  def test_validates_exclusion_of_generates_message
-    Topic.validates_exclusion_of :title, :in => %w(a b c)
-    @topic.title = 'a'
-    @topic.errors.expects(:generate_message).with(:title, :exclusion, {:value => 'a', :default => nil})
-    @topic.valid?
-  end
-  
-  def test_validates_exclusion_of_generates_message_with_custom_default_message
-    Topic.validates_exclusion_of :title, :in => %w(a b c), :message => 'custom'
-    @topic.title = 'a'
-    @topic.errors.expects(:generate_message).with(:title, :exclusion, {:value => 'a', :default => 'custom'})
-    @topic.valid?
-  end
+  # validates_exclusion_of w/o mocha
   
   def test_validates_exclusion_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:exclusion => 'custom message'}}}}}
@@ -401,22 +517,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     assert_equal 'global message', @topic.errors.on(:title)
   end
   
-  
-  # validates_numericality_of without :only_integer
-  
-  def test_validates_numericality_of_generates_message
-    Topic.validates_numericality_of :title
-    @topic.title = 'a'
-    @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => nil})
-    @topic.valid?
-  end
-  
-  def test_validates_numericality_of_generates_message_with_custom_default_message
-    Topic.validates_numericality_of :title, :message => 'custom'
-    @topic.title = 'a'
-    @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => 'custom'})
-    @topic.valid?
-  end
+  # validates_numericality_of without :only_integer w/o mocha
   
   def test_validates_numericality_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:not_a_number => 'custom message'}}}}}
@@ -437,22 +538,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     assert_equal 'global message', @topic.errors.on(:title)
   end
   
-  
-  # validates_numericality_of with :only_integer
-  
-  def test_validates_numericality_of_only_integer_generates_message
-    Topic.validates_numericality_of :title, :only_integer => true
-    @topic.title = 'a'
-    @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => nil})
-    @topic.valid?
-  end
-  
-  def test_validates_numericality_of_only_integer_generates_message_with_custom_default_message
-    Topic.validates_numericality_of :title, :only_integer => true, :message => 'custom'
-    @topic.title = 'a'
-    @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => 'custom'})
-    @topic.valid?
-  end
+  # validates_numericality_of with :only_integer w/o mocha
   
   def test_validates_numericality_of_only_integer_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:not_a_number => 'custom message'}}}}}
@@ -473,22 +559,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     assert_equal 'global message', @topic.errors.on(:title)
   end
   
-  
-  # validates_numericality_of :odd
-  
-  def test_validates_numericality_of_odd_generates_message
-    Topic.validates_numericality_of :title, :only_integer => true, :odd => true
-    @topic.title = 0
-    @topic.errors.expects(:generate_message).with(:title, :odd, {:value => 0, :default => nil})
-    @topic.valid?
-  end
-  
-  def test_validates_numericality_of_odd_generates_message_with_custom_default_message
-    Topic.validates_numericality_of :title, :only_integer => true, :odd => true, :message => 'custom'
-    @topic.title = 0
-    @topic.errors.expects(:generate_message).with(:title, :odd, {:value => 0, :default => 'custom'})
-    @topic.valid?
-  end
+  # validates_numericality_of :odd w/o mocha
   
   def test_validates_numericality_of_odd_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:odd => 'custom message'}}}}}
@@ -509,22 +580,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     assert_equal 'global message', @topic.errors.on(:title)
   end
   
-  
-  # validates_numericality_of :less_than
-  
-  def test_validates_numericality_of_less_than_generates_message
-    Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
-    @topic.title = 1
-    @topic.errors.expects(:generate_message).with(:title, :less_than, {:value => 1, :count => 0, :default => nil})
-    @topic.valid?
-  end
-  
-  def test_validates_numericality_of_odd_generates_message_with_custom_default_message
-    Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0, :message => 'custom'
-    @topic.title = 1
-    @topic.errors.expects(:generate_message).with(:title, :less_than, {:value => 1, :count => 0, :default => 'custom'})
-    @topic.valid?
-  end
+  # validates_numericality_of :less_than w/o mocha
   
   def test_validates_numericality_of_less_than_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:less_than => 'custom message'}}}}}
@@ -546,19 +602,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   
-  # validates_associated
-  
-  def test_validates_associated_generates_message
-    Topic.validates_associated :replies
-    replied_topic.errors.expects(:generate_message).with(:replies, :invalid, {:value => replied_topic.replies, :default => nil})
-    replied_topic.valid?
-  end
-  
-  def test_validates_associated_generates_message_with_custom_default_message
-    Topic.validates_associated :replies
-    replied_topic.errors.expects(:generate_message).with(:replies, :invalid, {:value => replied_topic.replies, :default => nil})
-    replied_topic.valid?
-  end
+  # validates_associated w/o mocha
   
   def test_validates_associated_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:replies => {:invalid => 'custom message'}}}}}
-- 
cgit v1.2.3


From 8f74ba96c47e77e18ce363c8e7cd2fc9196faf7a Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Wed, 2 Jul 2008 19:21:07 +0200
Subject: remove core extensions in favor of I18n#translate and I18n#localize

---
 activerecord/test/cases/validations_i18n_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index 53e90f4d53..840fcd81d0 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -79,7 +79,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
 
     def test_errors_full_messages_translates_human_attribute_name_for_model_attributes
       @topic.errors.instance_variable_set :@errors, { 'title' => 'empty' }
-      I18n.expects(:translate).with(:"active_record.human_attribute_names.topic.title", 'en-US').returns('Title')
+      I18n.expects(:translate).with(:"active_record.human_attribute_names.topic.title", 'en-US', :raise => true).returns('Title')
       @topic.errors.full_messages :locale => 'en-US'
     end
   end  
-- 
cgit v1.2.3


From e1a7f83fca862fd7472ef6b80f8b6a8d33849a8e Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Fri, 4 Jul 2008 22:22:20 +0200
Subject: use :default for human_attribute_name

---
 activerecord/test/cases/validations_i18n_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index 840fcd81d0..5be518c547 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -79,7 +79,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
 
     def test_errors_full_messages_translates_human_attribute_name_for_model_attributes
       @topic.errors.instance_variable_set :@errors, { 'title' => 'empty' }
-      I18n.expects(:translate).with(:"active_record.human_attribute_names.topic.title", 'en-US', :raise => true).returns('Title')
+      I18n.expects(:translate).with(:"active_record.human_attribute_names.topic.title", 'en-US', :default => 'Title').returns('Title')
       @topic.errors.full_messages :locale => 'en-US'
     end
   end  
-- 
cgit v1.2.3


From 84816ae981a8598e5e401eb1b9b805de840fefc9 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Sun, 6 Jul 2008 21:20:02 +0200
Subject: align with changes in i18n

---
 activerecord/test/cases/validations_i18n_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index 5be518c547..86834fe920 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -46,14 +46,14 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       global_scope = [:active_record, :error_messages]
       custom_scope = global_scope + [:custom, 'topic', :title]
 
-      I18n.expects(:t).with :scope => [:active_record, :error_messages], :default => [:"custom.topic.title.invalid", 'default from class def', :invalid]
+      I18n.expects(:t).with nil, :scope => [:active_record, :error_messages], :default => [:"custom.topic.title.invalid", 'default from class def', :invalid]
       @topic.errors.generate_message :title, :invalid, :default => 'default from class def'
     end
 
     def test_errors_generate_message_translates_custom_model_attribute_keys_with_sti
       custom_scope = [:active_record, :error_messages, :custom, 'topic', :title]
 
-      I18n.expects(:t).with :scope => [:active_record, :error_messages], :default => [:"custom.reply.title.invalid", :"custom.topic.title.invalid", 'default from class def', :invalid]
+      I18n.expects(:t).with nil, :scope => [:active_record, :error_messages], :default => [:"custom.reply.title.invalid", :"custom.topic.title.invalid", 'default from class def', :invalid]
       Reply.new.errors.generate_message :title, :invalid, :default => 'default from class def'
     end
 
@@ -79,7 +79,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
 
     def test_errors_full_messages_translates_human_attribute_name_for_model_attributes
       @topic.errors.instance_variable_set :@errors, { 'title' => 'empty' }
-      I18n.expects(:translate).with(:"active_record.human_attribute_names.topic.title", 'en-US', :default => 'Title').returns('Title')
+      I18n.expects(:translate).with(:"active_record.human_attribute_names.topic.title", :locale => 'en-US', :default => 'Title').returns('Title')
       @topic.errors.full_messages :locale => 'en-US'
     end
   end  
-- 
cgit v1.2.3


From 4f72feb84c25b54f66c7192c788b7fd965f2d493 Mon Sep 17 00:00:00 2001
From: Jonathan Viney <jonathan.viney@gmail.com>
Date: Wed, 2 Jul 2008 16:01:26 +1200
Subject: Move the transaction counter to the connection object rather than
 maintaining it on the current Thread.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#533 state:resolved]
---
 activerecord/test/cases/fixtures_test.rb    |  6 +++---
 activerecord/test/cases/multiple_db_test.rb | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index 0ea24868f1..6ba7597f56 100755
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -461,11 +461,11 @@ class FixturesBrokenRollbackTest < ActiveRecord::TestCase
   alias_method :teardown, :blank_teardown
 
   def test_no_rollback_in_teardown_unless_transaction_active
-    assert_equal 0, Thread.current['open_transactions']
+    assert_equal 0, ActiveRecord::Base.connection.open_transactions
     assert_raise(RuntimeError) { ar_setup_fixtures }
-    assert_equal 0, Thread.current['open_transactions']
+    assert_equal 0, ActiveRecord::Base.connection.open_transactions
     assert_nothing_raised { ar_teardown_fixtures }
-    assert_equal 0, Thread.current['open_transactions']
+    assert_equal 0, ActiveRecord::Base.connection.open_transactions
   end
 
   private
diff --git a/activerecord/test/cases/multiple_db_test.rb b/activerecord/test/cases/multiple_db_test.rb
index eb3e43c8ac..7c3e0f2ca6 100644
--- a/activerecord/test/cases/multiple_db_test.rb
+++ b/activerecord/test/cases/multiple_db_test.rb
@@ -57,4 +57,29 @@ class MultipleDbTest < ActiveRecord::TestCase
 
     assert Course.connection
   end
+
+  def test_transactions_across_databases
+    c1 = Course.find(1)
+    e1 = Entrant.find(1)
+
+    begin
+      Course.transaction do
+        Entrant.transaction do
+          c1.name = "Typo"
+          e1.name = "Typo"
+          c1.save
+          e1.save
+          raise "No I messed up."
+        end
+      end
+    rescue
+      # Yup caught it
+    end
+
+    assert_equal "Typo", c1.name
+    assert_equal "Typo", e1.name
+
+    assert_equal "Ruby Development", Course.find(1).name
+    assert_equal "Ruby Developer", Entrant.find(1).name
+  end
 end
-- 
cgit v1.2.3


From 459e5817a513b95741b77af26771a6252a13d01f Mon Sep 17 00:00:00 2001
From: miloops <miloops@gmail.com>
Date: Thu, 26 Jun 2008 13:46:33 -0300
Subject: update_counters should update nil values.

This allows counter columns with default null instead of requiring default 0.

[#493 state:resolved]
---
 activerecord/test/cases/base_test.rb | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index a4be629fbd..9e4f268db7 100755
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -19,6 +19,7 @@ require 'models/warehouse_thing'
 require 'rexml/document'
 
 class Category < ActiveRecord::Base; end
+class Categorization < ActiveRecord::Base; end
 class Smarts < ActiveRecord::Base; end
 class CreditCard < ActiveRecord::Base
   class PinNumber < ActiveRecord::Base
@@ -75,7 +76,7 @@ class TopicWithProtectedContentAndAccessibleAuthorName < ActiveRecord::Base
 end
 
 class BasicsTest < ActiveRecord::TestCase
-  fixtures :topics, :companies, :developers, :projects, :computers, :accounts, :minimalistics, 'warehouse-things', :authors
+  fixtures :topics, :companies, :developers, :projects, :computers, :accounts, :minimalistics, 'warehouse-things', :authors, :categorizations
 
   def test_table_exists
     assert !NonExistentTable.table_exists?
@@ -130,7 +131,7 @@ class BasicsTest < ActiveRecord::TestCase
 
   def test_read_attributes_before_type_cast
     category = Category.new({:name=>"Test categoty", :type => nil})
-    category_attrs = {"name"=>"Test categoty", "type" => nil}
+    category_attrs = {"name"=>"Test categoty", "type" => nil, "categorizations_count" => nil}
     assert_equal category_attrs , category.attributes_before_type_cast
   end
 
@@ -614,6 +615,22 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal -2, Topic.find(2).replies_count
   end
 
+  def test_update_counter
+    category = Category.first
+    assert_nil category.categorizations_count
+    assert_equal 2, category.categorizations.count
+
+    Category.update_counters(category.id, "categorizations_count" => category.categorizations.count)
+    category.reload
+    assert_not_nil category.categorizations_count
+    assert_equal 2, category.categorizations_count
+
+    Category.update_counters(category.id, "categorizations_count" => category.categorizations.count)
+    category.reload
+    assert_not_nil category.categorizations_count
+    assert_equal 4, category.categorizations_count
+  end
+
   def test_update_all
     assert_equal Topic.count, Topic.update_all("content = 'bulk updated!'")
     assert_equal "bulk updated!", Topic.find(1).content
-- 
cgit v1.2.3


From fbef982e4b906b879240a35a1ecff447007da6b2 Mon Sep 17 00:00:00 2001
From: Stefan Kaes <stkaes@googlemail.com>
Date: Tue, 15 Jul 2008 20:55:14 +0200
Subject: Observers not longer add an after_find method to the observed class.

[#625 state:resolved]
---
 activerecord/test/cases/lifecycle_test.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/lifecycle_test.rb b/activerecord/test/cases/lifecycle_test.rb
index 258f7c7a0f..3432abee31 100755
--- a/activerecord/test/cases/lifecycle_test.rb
+++ b/activerecord/test/cases/lifecycle_test.rb
@@ -143,12 +143,20 @@ class LifecycleTest < ActiveRecord::TestCase
     assert_equal developer.name, multi_observer.record.name
   end
 
-  def test_observing_after_find_when_not_defined_on_the_model
+  def test_after_find_cannot_be_observed_when_its_not_defined_on_the_model
     observer = MinimalisticObserver.instance
     assert_equal Minimalistic, MinimalisticObserver.observed_class
 
     minimalistic = Minimalistic.find(1)
-    assert_equal minimalistic, observer.minimalistic
+    assert_nil observer.minimalistic
+  end
+
+  def test_after_find_can_be_observed_when_its_defined_on_the_model
+    observer = TopicObserver.instance
+    assert_equal Topic, TopicObserver.observed_class
+
+    topic = Topic.find(1)
+    assert_equal topic, observer.topic
   end
 
   def test_invalid_observer
-- 
cgit v1.2.3


From a1fcbd971d681e44de5ea33e6a8470ff8b8144c0 Mon Sep 17 00:00:00 2001
From: Joachim Garth <jpgarth@googlemail.com>
Date: Fri, 27 Jun 2008 20:03:51 +0200
Subject: Make sure association preloading works with full STI class name [#465
 state:Resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 .../eager_load_includes_full_sti_class_test.rb     | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb b/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
new file mode 100644
index 0000000000..7c470616a5
--- /dev/null
+++ b/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
@@ -0,0 +1,36 @@
+require 'cases/helper'
+require 'models/post'
+require 'models/tagging'
+
+module Namespaced
+  class Post < ActiveRecord::Base
+    set_table_name 'posts'
+    has_one :tagging, :as => :taggable, :class_name => 'Tagging'
+  end
+end
+
+class EagerLoadIncludeFullStiClassNamesTest < ActiveRecord::TestCase
+
+  def setup
+    generate_test_objects
+  end
+
+  def generate_test_objects
+    post = Namespaced::Post.create( :title => 'Great stuff', :body => 'This is not', :author_id => 1 )
+    tagging = Tagging.create( :taggable => post )
+  end
+
+  def test_class_names
+    old = ActiveRecord::Base.store_full_sti_class
+
+    ActiveRecord::Base.store_full_sti_class = false
+    post = Namespaced::Post.find_by_title( 'Great stuff', :include => :tagging )
+    assert_nil post.tagging
+
+    ActiveRecord::Base.store_full_sti_class = true
+    post = Namespaced::Post.find_by_title( 'Great stuff', :include => :tagging )
+    assert_equal 'Tagging', post.tagging.class.name
+  ensure
+    ActiveRecord::Base.store_full_sti_class = old
+  end
+end
-- 
cgit v1.2.3


From f2059393481ceb632abc7a9d92670e409020d5bd Mon Sep 17 00:00:00 2001
From: Tom Ward <tom@popdog.net>
Date: Sat, 19 Jul 2008 09:58:09 +0100
Subject: Ensure checked value is a string when validating case-sensitive
 uniqueness [#361 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 activerecord/test/cases/validations_test.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_test.rb b/activerecord/test/cases/validations_test.rb
index 60b00b3e8f..4b2d28c80b 100755
--- a/activerecord/test/cases/validations_test.rb
+++ b/activerecord/test/cases/validations_test.rb
@@ -477,6 +477,15 @@ class ValidationsTest < ActiveRecord::TestCase
     assert_not_equal "has already been taken", t3.errors.on(:title)
   end
 
+  def test_validate_case_sensitive_uniqueness_with_attribute_passed_as_integer
+    Topic.validates_uniqueness_of(:title, :case_sensitve => true)
+    t = Topic.create!('title' => 101)
+
+    t2 = Topic.new('title' => 101)
+    assert !t2.valid?
+    assert t2.errors.on(:title)
+  end
+
   def test_validate_uniqueness_with_non_standard_table_names
     i1 = WarehouseThing.create(:value => 1000)
     assert !i1.valid?, "i1 should not be valid"
-- 
cgit v1.2.3


From c67713a2fe78d6f2db49b09771841f5022995703 Mon Sep 17 00:00:00 2001
From: Daniel Guettler <daniel.guettler@gmail.com>
Date: Mon, 21 Jul 2008 15:21:13 -0400
Subject: Use klass.sti_name to make sure associations take
 store_full_sti_class into account. [#671 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 .../cases/associations/has_many_associations_test.rb   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index b9c7ec6377..f8b8b1f96d 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -999,4 +999,22 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert firm.clients.loaded?
   end
 
+  def test_joins_with_namespaced_model_should_use_correct_type
+    old = ActiveRecord::Base.store_full_sti_class
+    ActiveRecord::Base.store_full_sti_class = true
+
+    firm = Namespaced::Firm.create({ :name => 'Some Company' })
+    firm.clients.create({ :name => 'Some Client' })
+
+    stats = Namespaced::Firm.find(firm.id, {
+      :select => "#{Namespaced::Firm.table_name}.*, COUNT(#{Namespaced::Client.table_name}.id) AS num_clients",
+      :joins  => :clients,
+      :group  => "#{Namespaced::Firm.table_name}.id"
+    })
+    assert_equal 1, stats.num_clients.to_i
+
+  ensure
+    ActiveRecord::Base.store_full_sti_class = old
+  end
+
 end
-- 
cgit v1.2.3


From 93e10f9911fb2a096681ee0a0bc82487a9a06c44 Mon Sep 17 00:00:00 2001
From: Jan De Poorter <jan@defv.be>
Date: Wed, 23 Jul 2008 12:50:16 +0200
Subject: Ensure NamedScope#any? uses COUNT query wherever possible. [#680
 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 activerecord/test/cases/named_scope_test.rb | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index 0c1eb23428..e21ffbbdba 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -184,6 +184,28 @@ class NamedScopeTest < ActiveRecord::TestCase
     end
   end
 
+  def test_any_should_not_load_results
+    topics = Topic.base
+    assert_queries(1) do
+      topics.expects(:empty?).returns(true)
+      assert !topics.any?
+    end
+  end
+
+  def test_any_should_call_proxy_found_if_using_a_block
+    topics = Topic.base
+    assert_queries(1) do
+      topics.expects(:empty?).never
+      topics.any? { true }
+    end
+  end
+
+  def test_any_should_not_fire_query_if_named_scope_loaded
+    topics = Topic.base
+    topics.collect # force load
+    assert_no_queries { assert topics.any? }
+  end
+
   def test_should_build_with_proxy_options
     topic = Topic.approved.build({})
     assert topic.approved
-- 
cgit v1.2.3


From e8fc894f66daa7909d1790f2cd145844d256d282 Mon Sep 17 00:00:00 2001
From: George Ogata <george.ogata@gmail.com>
Date: Wed, 23 Jul 2008 06:38:26 +1000
Subject: Make observers define #after_find in the model only if needed.

[#676 state:resolved]
Signed-off-by: Michael Koziarski <michael@koziarski.com>
---
 activerecord/test/cases/lifecycle_test.rb | 32 +++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/lifecycle_test.rb b/activerecord/test/cases/lifecycle_test.rb
index 3432abee31..ab005c6b00 100755
--- a/activerecord/test/cases/lifecycle_test.rb
+++ b/activerecord/test/cases/lifecycle_test.rb
@@ -143,12 +143,12 @@ class LifecycleTest < ActiveRecord::TestCase
     assert_equal developer.name, multi_observer.record.name
   end
 
-  def test_after_find_cannot_be_observed_when_its_not_defined_on_the_model
+  def test_after_find_can_be_observed_when_its_not_defined_on_the_model
     observer = MinimalisticObserver.instance
     assert_equal Minimalistic, MinimalisticObserver.observed_class
 
     minimalistic = Minimalistic.find(1)
-    assert_nil observer.minimalistic
+    assert_equal minimalistic, observer.minimalistic
   end
 
   def test_after_find_can_be_observed_when_its_defined_on_the_model
@@ -159,6 +159,34 @@ class LifecycleTest < ActiveRecord::TestCase
     assert_equal topic, observer.topic
   end
 
+  def test_after_find_is_not_created_if_its_not_used
+    # use a fresh class so an observer can't have defined an
+    # after_find on it
+    model_class = Class.new(ActiveRecord::Base)
+    observer_class = Class.new(ActiveRecord::Observer)
+    observer_class.observe(model_class)
+
+    observer = observer_class.instance
+
+    assert !model_class.method_defined?(:after_find)
+  end
+
+  def test_after_find_is_not_clobbered_if_it_already_exists
+    # use a fresh observer class so we can instantiate it (Observer is
+    # a Singleton)
+    model_class = Class.new(ActiveRecord::Base) do
+      def after_find; end
+    end
+    original_method = model_class.instance_method(:after_find)
+    observer_class = Class.new(ActiveRecord::Observer) do
+      def after_find; end
+    end
+    observer_class.observe(model_class)
+
+    observer = observer_class.instance
+    assert_equal original_method, model_class.instance_method(:after_find)
+  end
+
   def test_invalid_observer
     assert_raise(ArgumentError) { Topic.observers = Object.new; Topic.instantiate_observers }
   end
-- 
cgit v1.2.3


From 108db00aa90fe266564483ab301cf0669cae600f Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Thu, 31 Jul 2008 15:56:46 +0100
Subject: Raise UnknownAttributeError when unknown attributes are supplied via
 mass assignment

---
 activerecord/test/cases/base_test.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 9e4f268db7..e6d1b5ddfd 100755
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -904,6 +904,14 @@ class BasicsTest < ActiveRecord::TestCase
     assert_nil keyboard.id
   end
 
+  def test_mass_assigning_invalid_attribute
+    firm = Firm.new
+
+    assert_raises(ActiveRecord::UnknownAttributeError) do
+      firm.attributes = { "id" => 5, "type" => "Client", "i_dont_even_exist" => 20 }
+    end
+  end
+
   def test_mass_assignment_protection_on_defaults
     firm = Firm.new
     firm.attributes = { "id" => 5, "type" => "Client" }
-- 
cgit v1.2.3


From fb5cc19707582fa61ca3e426697cc2b00e9e5ffa Mon Sep 17 00:00:00 2001
From: miloops <miloops@gmail.com>
Date: Thu, 31 Jul 2008 10:57:50 -0300
Subject: Fix HasManyThroughAssociationsTest tests. [#733 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 .../cases/associations/has_many_through_associations_test.rb     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
index be5170f830..d51a3c7e1c 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -2,15 +2,18 @@ require "cases/helper"
 require 'models/post'
 require 'models/person'
 require 'models/reader'
+require 'models/comment'
 
 class HasManyThroughAssociationsTest < ActiveRecord::TestCase
-  fixtures :posts, :readers, :people
+  fixtures :posts, :readers, :people, :comments
 
   def test_associate_existing
     assert_queries(2) { posts(:thinking);people(:david) }
-    
+
+    posts(:thinking).people
+
     assert_queries(1) do
-       posts(:thinking).people << people(:david)
+      posts(:thinking).people << people(:david)
     end
     
     assert_queries(1) do
-- 
cgit v1.2.3


From 896a3b9ab8dc02639ffa0b1dbf85011e1f3eda9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarmo=20T=C3=A4nav?= <tarmo@itech.ee>
Date: Thu, 31 Jul 2008 19:52:35 +0300
Subject: Fixed test_joins_with_namespaced_model_should_use_correct_type for
 postgresql

Signed-off-by: Michael Koziarski <michael@koziarski.com>
---
 activerecord/test/cases/associations/has_many_associations_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index f8b8b1f96d..47e4b3527d 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -1007,7 +1007,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     firm.clients.create({ :name => 'Some Client' })
 
     stats = Namespaced::Firm.find(firm.id, {
-      :select => "#{Namespaced::Firm.table_name}.*, COUNT(#{Namespaced::Client.table_name}.id) AS num_clients",
+      :select => "#{Namespaced::Firm.table_name}.id, COUNT(#{Namespaced::Client.table_name}.id) AS num_clients",
       :joins  => :clients,
       :group  => "#{Namespaced::Firm.table_name}.id"
     })
-- 
cgit v1.2.3


From 656f0e7c6c9a305abaf9f9b7fb80479b6f94efce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarmo=20T=C3=A4nav?= <tarmo@itech.ee>
Date: Thu, 31 Jul 2008 16:36:23 -0500
Subject: Fix file permissions

Signed-off-by: Joshua Peek <josh@joshpeek.com>
---
 activerecord/test/cases/associations/belongs_to_associations_test.rb | 0
 activerecord/test/cases/associations/has_one_associations_test.rb    | 0
 activerecord/test/cases/associations_test.rb                         | 0
 activerecord/test/cases/attribute_methods_test.rb                    | 0
 activerecord/test/cases/base_test.rb                                 | 0
 activerecord/test/cases/deprecated_finder_test.rb                    | 0
 activerecord/test/cases/fixtures_test.rb                             | 0
 activerecord/test/cases/inheritance_test.rb                          | 0
 activerecord/test/cases/lifecycle_test.rb                            | 0
 activerecord/test/cases/readonly_test.rb                             | 0
 activerecord/test/cases/unconnected_test.rb                          | 0
 activerecord/test/cases/validations_test.rb                          | 0
 12 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 activerecord/test/cases/associations/belongs_to_associations_test.rb
 mode change 100755 => 100644 activerecord/test/cases/associations/has_one_associations_test.rb
 mode change 100755 => 100644 activerecord/test/cases/associations_test.rb
 mode change 100755 => 100644 activerecord/test/cases/attribute_methods_test.rb
 mode change 100755 => 100644 activerecord/test/cases/base_test.rb
 mode change 100755 => 100644 activerecord/test/cases/deprecated_finder_test.rb
 mode change 100755 => 100644 activerecord/test/cases/fixtures_test.rb
 mode change 100755 => 100644 activerecord/test/cases/inheritance_test.rb
 mode change 100755 => 100644 activerecord/test/cases/lifecycle_test.rb
 mode change 100755 => 100644 activerecord/test/cases/readonly_test.rb
 mode change 100755 => 100644 activerecord/test/cases/unconnected_test.rb
 mode change 100755 => 100644 activerecord/test/cases/validations_test.rb

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb
old mode 100755
new mode 100644
diff --git a/activerecord/test/cases/associations/has_one_associations_test.rb b/activerecord/test/cases/associations/has_one_associations_test.rb
old mode 100755
new mode 100644
diff --git a/activerecord/test/cases/associations_test.rb b/activerecord/test/cases/associations_test.rb
old mode 100755
new mode 100644
diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb
old mode 100755
new mode 100644
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
old mode 100755
new mode 100644
diff --git a/activerecord/test/cases/deprecated_finder_test.rb b/activerecord/test/cases/deprecated_finder_test.rb
old mode 100755
new mode 100644
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
old mode 100755
new mode 100644
diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb
old mode 100755
new mode 100644
diff --git a/activerecord/test/cases/lifecycle_test.rb b/activerecord/test/cases/lifecycle_test.rb
old mode 100755
new mode 100644
diff --git a/activerecord/test/cases/readonly_test.rb b/activerecord/test/cases/readonly_test.rb
old mode 100755
new mode 100644
diff --git a/activerecord/test/cases/unconnected_test.rb b/activerecord/test/cases/unconnected_test.rb
old mode 100755
new mode 100644
diff --git a/activerecord/test/cases/validations_test.rb b/activerecord/test/cases/validations_test.rb
old mode 100755
new mode 100644
-- 
cgit v1.2.3


From 82343859d568799a4151facbde1f8c711ecb7a3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarmo=20T=C3=A4nav?= <tarmo@itech.ee>
Date: Thu, 31 Jul 2008 23:59:53 +0300
Subject: Added missing fixtures for tests which fail to run independently if
 run after schema reset

Signed-off-by: Michael Koziarski <michael@koziarski.com>
---
 activerecord/test/cases/associations/cascaded_eager_loading_test.rb     | 2 +-
 activerecord/test/cases/associations/eager_test.rb                      | 2 +-
 .../cases/associations/has_and_belongs_to_many_associations_test.rb     | 2 +-
 activerecord/test/cases/associations/has_many_associations_test.rb      | 2 +-
 activerecord/test/cases/base_test.rb                                    | 2 +-
 activerecord/test/cases/lifecycle_test.rb                               | 2 +-
 activerecord/test/cases/method_scoping_test.rb                          | 2 +-
 activerecord/test/cases/query_cache_test.rb                             | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/cascaded_eager_loading_test.rb b/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
index 3631be76a0..1f8a1090eb 100644
--- a/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
+++ b/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
@@ -9,7 +9,7 @@ require 'models/topic'
 require 'models/reply'
 
 class CascadedEagerLoadingTest < ActiveRecord::TestCase
-  fixtures :authors, :mixins, :companies, :posts, :topics
+  fixtures :authors, :mixins, :companies, :posts, :topics, :accounts, :comments, :categorizations
 
   def test_eager_association_loading_with_cascaded_two_levels
     authors = Author.find(:all, :include=>{:posts=>:comments}, :order=>"authors.id")
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index f65ada550b..58506574f8 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -21,7 +21,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
   fixtures :posts, :comments, :authors, :categories, :categories_posts,
             :companies, :accounts, :tags, :taggings, :people, :readers,
             :owners, :pets, :author_favorites, :jobs, :references, :subscribers, :subscriptions, :books,
-            :developers, :projects
+            :developers, :projects, :developers_projects
 
   def test_loading_with_one_association
     posts = Post.find(:all, :include => :comments)
diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
index b29df68d22..1ed0522e53 100644
--- a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
@@ -70,7 +70,7 @@ end
 
 class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
   fixtures :accounts, :companies, :categories, :posts, :categories_posts, :developers, :projects, :developers_projects,
-           :parrots, :pirates, :treasures, :price_estimates
+           :parrots, :pirates, :treasures, :price_estimates, :tags, :taggings
 
   def test_has_and_belongs_to_many
     david = Developer.find(1)
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index 47e4b3527d..b806e885e1 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -14,7 +14,7 @@ require 'models/reader'
 class HasManyAssociationsTest < ActiveRecord::TestCase
   fixtures :accounts, :categories, :companies, :developers, :projects,
            :developers_projects, :topics, :authors, :comments, :author_addresses,
-           :people, :posts
+           :people, :posts, :readers
 
   def setup
     Client.destroyed_client_ids.clear
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index e6d1b5ddfd..0f9eda4d09 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -76,7 +76,7 @@ class TopicWithProtectedContentAndAccessibleAuthorName < ActiveRecord::Base
 end
 
 class BasicsTest < ActiveRecord::TestCase
-  fixtures :topics, :companies, :developers, :projects, :computers, :accounts, :minimalistics, 'warehouse-things', :authors, :categorizations
+  fixtures :topics, :companies, :developers, :projects, :computers, :accounts, :minimalistics, 'warehouse-things', :authors, :categorizations, :categories
 
   def test_table_exists
     assert !NonExistentTable.table_exists?
diff --git a/activerecord/test/cases/lifecycle_test.rb b/activerecord/test/cases/lifecycle_test.rb
index ab005c6b00..54fb3d8c39 100644
--- a/activerecord/test/cases/lifecycle_test.rb
+++ b/activerecord/test/cases/lifecycle_test.rb
@@ -74,7 +74,7 @@ class MultiObserver < ActiveRecord::Observer
 end
 
 class LifecycleTest < ActiveRecord::TestCase
-  fixtures :topics, :developers
+  fixtures :topics, :developers, :minimalistics
 
   def test_before_destroy
     original_count = Topic.count
diff --git a/activerecord/test/cases/method_scoping_test.rb b/activerecord/test/cases/method_scoping_test.rb
index d6b3e341df..ee66ac948d 100644
--- a/activerecord/test/cases/method_scoping_test.rb
+++ b/activerecord/test/cases/method_scoping_test.rb
@@ -6,7 +6,7 @@ require 'models/post'
 require 'models/category'
 
 class MethodScopingTest < ActiveRecord::TestCase
-  fixtures :developers, :projects, :comments, :posts
+  fixtures :developers, :projects, :comments, :posts, :developers_projects
 
   def test_set_conditions
     Developer.with_scope(:find => { :conditions => 'just a test...' }) do
diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb
index dc9eeec281..eae2104531 100644
--- a/activerecord/test/cases/query_cache_test.rb
+++ b/activerecord/test/cases/query_cache_test.rb
@@ -58,7 +58,7 @@ end
 uses_mocha 'QueryCacheExpiryTest' do
 
 class QueryCacheExpiryTest < ActiveRecord::TestCase
-  fixtures :tasks
+  fixtures :tasks, :posts, :categories, :categories_posts
 
   def test_find
     Task.connection.expects(:clear_query_cache).times(1)
-- 
cgit v1.2.3


From 080974784582e1e289c2948227b446bc56d404a1 Mon Sep 17 00:00:00 2001
From: Nik Wakelin <nik@codetocustomer.com>
Date: Sat, 2 Aug 2008 17:44:02 +1200
Subject: Added MigrationProxy to defer loading of Migration classes until they
 are actually required by the migrator

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#747 state:resolved]
---
 activerecord/test/cases/migration_test.rb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 7ecf755ef8..920f719995 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -922,6 +922,26 @@ if ActiveRecord::Base.connection.supports_migrations?
       migrations[0].name    == 'innocent_jointable'
     end
 
+    def test_only_loads_pending_migrations
+      # migrate up to 1
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
+
+      # now unload the migrations that have been defined
+      PeopleHaveLastNames.unloadable
+      ActiveSupport::Dependencies.remove_unloadable_constants!
+
+      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", nil)
+
+      assert !defined? PeopleHaveLastNames
+
+      %w(WeNeedReminders, InnocentJointable).each do |migration|
+        assert defined? migration
+      end
+
+    ensure
+      load(MIGRATIONS_ROOT + "/valid/1_people_have_last_names.rb")
+    end
+
     def test_migrator_interleaved_migrations
       ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/interleaved/pass_1")
 
-- 
cgit v1.2.3


From 1db7c9cf4a153bbc9001d69508f58b3e8b288c34 Mon Sep 17 00:00:00 2001
From: Ryan Bates <ryan@railscasts.com>
Date: Thu, 7 Aug 2008 19:33:44 -0700
Subject: fixing "test_any_should_not_load_results" so it doesn't depend on
 latest version of Mocha

Signed-off-by: Michael Koziarski <michael@koziarski.com>
---
 activerecord/test/cases/named_scope_test.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index e21ffbbdba..7bd712e11e 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -186,9 +186,10 @@ class NamedScopeTest < ActiveRecord::TestCase
 
   def test_any_should_not_load_results
     topics = Topic.base
-    assert_queries(1) do
-      topics.expects(:empty?).returns(true)
-      assert !topics.any?
+    assert_queries(2) do
+      topics.any?    # use count query
+      topics.collect # force load
+      topics.any?    # use loaded (no query)
     end
   end
 
-- 
cgit v1.2.3


From 7f6e7ba1f7e8735f1c3f30ba125b5432f00d2a70 Mon Sep 17 00:00:00 2001
From: Ernie Miller <ernie@metautonomo.us>
Date: Sat, 2 Aug 2008 11:47:05 -0400
Subject: Fixed AssociationCollection#<< resulting in unexpected values in
 @target when :uniq => true

Signed-off-by: Michael Koziarski <michael@koziarski.com>
---
 .../associations/has_and_belongs_to_many_associations_test.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
index 1ed0522e53..f71b122ff0 100644
--- a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
@@ -299,6 +299,17 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 3, projects(:active_record, :reload).developers.size
   end
 
+  def test_uniq_option_prevents_duplicate_push
+    project = projects(:active_record)
+    project.developers << developers(:jamis)
+    project.developers << developers(:david)
+    assert_equal 3, project.developers.size
+
+    project.developers << developers(:david)
+    project.developers << developers(:jamis)
+    assert_equal 3, project.developers.size
+  end
+
   def test_deleting
     david = Developer.find(1)
     active_record = Project.find(1)
-- 
cgit v1.2.3


From bdf783b5a8b83b1d565027130de4743fda336523 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Sun, 10 Aug 2008 21:25:24 +0200
Subject: update i18n usage for pluralization hashes (api change)

---
 activerecord/test/cases/validations_i18n_test.rb | 198 +++++++++++++++++++++--
 1 file changed, 188 insertions(+), 10 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index 86834fe920..89ca61a220 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -45,38 +45,38 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     def test_errors_generate_message_translates_custom_model_attribute_key
       global_scope = [:active_record, :error_messages]
       custom_scope = global_scope + [:custom, 'topic', :title]
-
+  
       I18n.expects(:t).with nil, :scope => [:active_record, :error_messages], :default => [:"custom.topic.title.invalid", 'default from class def', :invalid]
       @topic.errors.generate_message :title, :invalid, :default => 'default from class def'
     end
-
+  
     def test_errors_generate_message_translates_custom_model_attribute_keys_with_sti
       custom_scope = [:active_record, :error_messages, :custom, 'topic', :title]
-
+  
       I18n.expects(:t).with nil, :scope => [:active_record, :error_messages], :default => [:"custom.reply.title.invalid", :"custom.topic.title.invalid", 'default from class def', :invalid]
       Reply.new.errors.generate_message :title, :invalid, :default => 'default from class def'
     end
-
+  
     def test_errors_add_on_empty_generates_message
       @topic.errors.expects(:generate_message).with(:title, :empty, {:default => nil})
       @topic.errors.add_on_empty :title
     end
-
+  
     def test_errors_add_on_empty_generates_message_with_custom_default_message
       @topic.errors.expects(:generate_message).with(:title, :empty, {:default => 'custom'})
       @topic.errors.add_on_empty :title, 'custom'
     end
-
+  
     def test_errors_add_on_blank_generates_message
       @topic.errors.expects(:generate_message).with(:title, :blank, {:default => nil})
       @topic.errors.add_on_blank :title
     end
-
+  
     def test_errors_add_on_blank_generates_message_with_custom_default_message
       @topic.errors.expects(:generate_message).with(:title, :blank, {:default => 'custom'})
       @topic.errors.add_on_blank :title, 'custom'
     end
-
+  
     def test_errors_full_messages_translates_human_attribute_name_for_model_attributes
       @topic.errors.instance_variable_set :@errors, { 'title' => 'empty' }
       I18n.expects(:translate).with(:"active_record.human_attribute_names.topic.title", :locale => 'en-US', :default => 'Title').returns('Title')
@@ -203,14 +203,14 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     def test_validates_uniqueness_of_generates_message
       Topic.validates_uniqueness_of :title
       @topic.title = unique_topic.title
-      @topic.errors.expects(:generate_message).with(:title, :taken, {:default => nil})
+      @topic.errors.expects(:generate_message).with(:title, :taken, {:default => nil, :value => 'unique!'})
       @topic.valid?
     end
 
     def test_validates_uniqueness_of_generates_message_with_custom_default_message
       Topic.validates_uniqueness_of :title, :message => 'custom'
       @topic.title = unique_topic.title
-      @topic.errors.expects(:generate_message).with(:title, :taken, {:default => 'custom'})
+      @topic.errors.expects(:generate_message).with(:title, :taken, {:default => 'custom', :value => 'unique!'})
       @topic.valid?
     end
     
@@ -620,4 +620,182 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     replied_topic.valid?
     assert_equal 'global message', replied_topic.errors.on(:replies)
   end
+end
+
+class ActiveRecordValidationsGenerateMessageI18nTests < Test::Unit::TestCase
+  def setup
+    reset_callbacks Topic
+    @topic = Topic.new
+    I18n.backend.store_translations :'en-US', {
+      :active_record => {
+        :error_messages => {
+          :inclusion => "is not included in the list",
+          :exclusion => "is reserved",
+          :invalid => "is invalid",
+          :confirmation => "doesn't match confirmation",
+          :accepted  => "must be accepted",
+          :empty => "can't be empty",
+          :blank => "can't be blank",
+          :too_long => "is too long (maximum is {{count}} characters)",
+          :too_short => "is too short (minimum is {{count}} characters)",
+          :wrong_length => "is the wrong length (should be {{count}} characters)",
+          :taken => "has already been taken",
+          :not_a_number => "is not a number",
+          :greater_than => "must be greater than {{count}}",
+          :greater_than_or_equal_to => "must be greater than or equal to {{count}}",
+          :equal_to => "must be equal to {{count}}",
+          :less_than => "must be less than {{count}}",
+          :less_than_or_equal_to => "must be less than or equal to {{count}}",
+          :odd => "must be odd",
+          :even => "must be even"
+        }            
+      }
+    }
+  end
+  
+  def reset_callbacks(*models)
+    models.each do |model|
+      model.instance_variable_set("@validate_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
+      model.instance_variable_set("@validate_on_create_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
+      model.instance_variable_set("@validate_on_update_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
+    end
+  end
+  
+  # validates_inclusion_of: generate_message(attr_name, :inclusion, :default => configuration[:message], :value => value)
+  def test_generate_message_inclusion_with_default_message
+    assert_equal 'is not included in the list', @topic.errors.generate_message(:title, :inclusion, :default => nil, :value => 'title')
+  end
+  
+  def test_generate_message_inclusion_with_custom_message
+    assert_equal 'custom message title', @topic.errors.generate_message(:title, :inclusion, :default => 'custom message {{value}}', :value => 'title')
+  end
+  
+  # validates_exclusion_of: generate_message(attr_name, :exclusion, :default => configuration[:message], :value => value)
+  def test_generate_message_exclusion_with_default_message
+    assert_equal 'is reserved', @topic.errors.generate_message(:title, :exclusion, :default => nil, :value => 'title')
+  end
+  
+  def test_generate_message_exclusion_with_custom_message
+    assert_equal 'custom message title', @topic.errors.generate_message(:title, :exclusion, :default => 'custom message {{value}}', :value => 'title')
+  end
+  
+  # validates_associated: generate_message(attr_name, :invalid, :default => configuration[:message], :value => value)
+  # validates_format_of:  generate_message(attr_name, :invalid, :default => configuration[:message], :value => value)
+  def test_generate_message_invalid_with_default_message
+    assert_equal 'is invalid', @topic.errors.generate_message(:title, :invalid, :default => nil, :value => 'title')
+  end
+  
+  def test_generate_message_invalid_with_custom_message
+    assert_equal 'custom message title', @topic.errors.generate_message(:title, :invalid, :default => 'custom message {{value}}', :value => 'title')
+  end
+  
+  # validates_confirmation_of: generate_message(attr_name, :confirmation, :default => configuration[:message])
+  def test_generate_message_confirmation_with_default_message
+    assert_equal "doesn't match confirmation", @topic.errors.generate_message(:title, :confirmation, :default => nil)
+  end
+  
+  def test_generate_message_confirmation_with_custom_message
+    assert_equal 'custom message', @topic.errors.generate_message(:title, :confirmation, :default => 'custom message')
+  end
+  
+  # validates_acceptance_of: generate_message(attr_name, :accepted, :default => configuration[:message])
+  def test_generate_message_accepted_with_default_message
+    assert_equal "must be accepted", @topic.errors.generate_message(:title, :accepted, :default => nil)
+  end
+  
+  def test_generate_message_accepted_with_custom_message
+    assert_equal 'custom message', @topic.errors.generate_message(:title, :accepted, :default => 'custom message')
+  end
+  
+  # add_on_empty: generate_message(attr, :empty, :default => custom_message)
+  def test_generate_message_empty_with_default_message
+    assert_equal "can't be empty", @topic.errors.generate_message(:title, :empty, :default => nil)
+  end
+  
+  def test_generate_message_empty_with_custom_message
+    assert_equal 'custom message', @topic.errors.generate_message(:title, :empty, :default => 'custom message')
+  end
+  
+  # add_on_blank: generate_message(attr, :blank, :default => custom_message)
+  def test_generate_message_blank_with_default_message
+    assert_equal "can't be blank", @topic.errors.generate_message(:title, :blank, :default => nil)
+  end
+  
+  def test_generate_message_blank_with_custom_message
+    assert_equal 'custom message', @topic.errors.generate_message(:title, :blank, :default => 'custom message')
+  end
+  
+  # validates_length_of: generate_message(attr, :too_long, :default => options[:too_long], :count => option_value.end)
+  def test_generate_message_too_long_with_default_message
+    assert_equal "is too long (maximum is 10 characters)", @topic.errors.generate_message(:title, :too_long, :default => nil, :count => 10)
+  end
+  
+  def test_generate_message_too_long_with_custom_message
+    assert_equal 'custom message 10', @topic.errors.generate_message(:title, :too_long, :default => 'custom message {{count}}', :count => 10)
+  end
+  
+  # validates_length_of: generate_message(attr, :too_short, :default => options[:too_short], :count => option_value.begin)
+  def test_generate_message_too_short_with_default_message
+    assert_equal "is too short (minimum is 10 characters)", @topic.errors.generate_message(:title, :too_short, :default => nil, :count => 10)
+  end
+  
+  def test_generate_message_too_short_with_custom_message
+    assert_equal 'custom message 10', @topic.errors.generate_message(:title, :too_short, :default => 'custom message {{count}}', :count => 10)
+  end  
+  
+  # validates_length_of: generate_message(attr, key, :default => custom_message, :count => option_value)
+  def test_generate_message_wrong_length_with_default_message
+    assert_equal "is the wrong length (should be 10 characters)", @topic.errors.generate_message(:title, :wrong_length, :default => nil, :count => 10)
+  end
+  
+  def test_generate_message_wrong_length_with_custom_message
+    assert_equal 'custom message 10', @topic.errors.generate_message(:title, :wrong_length, :default => 'custom message {{count}}', :count => 10)
+  end  
+
+  # validates_uniqueness_of: generate_message(attr_name, :taken, :default => configuration[:message])
+  def test_generate_message_taken_with_default_message
+    assert_equal "has already been taken", @topic.errors.generate_message(:title, :taken, :default => nil, :value => 'title')
+  end
+  
+  def test_generate_message_taken_with_custom_message
+    assert_equal 'custom message title', @topic.errors.generate_message(:title, :taken, :default => 'custom message {{value}}', :value => 'title')
+  end  
+
+  # validates_numericality_of: generate_message(attr_name, :not_a_number, :value => raw_value, :default => configuration[:message])
+  def test_generate_message_not_a_number_with_default_message
+    assert_equal "is not a number", @topic.errors.generate_message(:title, :not_a_number, :default => nil, :value => 'title')
+  end
+  
+  def test_generate_message_not_a_number_with_custom_message
+    assert_equal 'custom message title', @topic.errors.generate_message(:title, :not_a_number, :default => 'custom message {{value}}', :value => 'title')
+  end  
+
+  # validates_numericality_of: generate_message(attr_name, option, :value => raw_value, :default => configuration[:message])
+  def test_generate_message_greater_than_with_default_message
+    assert_equal "must be greater than 10", @topic.errors.generate_message(:title, :greater_than, :default => nil, :value => 'title', :count => 10)
+  end
+
+  def test_generate_message_greater_than_or_equal_to_with_default_message
+    assert_equal "must be greater than or equal to 10", @topic.errors.generate_message(:title, :greater_than_or_equal_to, :default => nil, :value => 'title', :count => 10)
+  end
+
+  def test_generate_message_equal_to_with_default_message
+    assert_equal "must be equal to 10", @topic.errors.generate_message(:title, :equal_to, :default => nil, :value => 'title', :count => 10)
+  end
+
+  def test_generate_message_less_than_with_default_message
+    assert_equal "must be less than 10", @topic.errors.generate_message(:title, :less_than, :default => nil, :value => 'title', :count => 10)
+  end
+
+  def test_generate_message_less_than_or_equal_to_with_default_message
+    assert_equal "must be less than or equal to 10", @topic.errors.generate_message(:title, :less_than_or_equal_to, :default => nil, :value => 'title', :count => 10)
+  end
+
+  def test_generate_message_odd_with_default_message
+    assert_equal "must be odd", @topic.errors.generate_message(:title, :odd, :default => nil, :value => 'title', :count => 10)
+  end
+
+  def test_generate_message_even_with_default_message
+    assert_equal "must be even", @topic.errors.generate_message(:title, :even, :default => nil, :value => 'title', :count => 10)
+  end
 end
\ No newline at end of file
-- 
cgit v1.2.3


From 992fda16ed662f028700d63a8dcbd1837f1d58ab Mon Sep 17 00:00:00 2001
From: Tom Lea <contrib@tomlea.co.uk>
Date: Mon, 11 Aug 2008 18:16:58 +0100
Subject: Serialized attributes will now always be saved even with
 partial_updates turned on.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#788 state:committed]
---
 activerecord/test/cases/dirty_test.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/dirty_test.rb b/activerecord/test/cases/dirty_test.rb
index e5e022050d..feb47a15a8 100644
--- a/activerecord/test/cases/dirty_test.rb
+++ b/activerecord/test/cases/dirty_test.rb
@@ -191,6 +191,18 @@ class DirtyTest < ActiveRecord::TestCase
     assert !pirate.changed?
   end
 
+  def test_save_should_store_serialized_attributes_even_with_partial_updates
+    with_partial_updates(Topic) do
+      topic = Topic.create!(:content => {:a => "a"})
+      topic.content[:b] = "b"
+      #assert topic.changed? # Known bug, will fail
+      topic.save!
+      assert_equal "b", topic.content[:b]
+      topic.reload
+      assert_equal "b", topic.content[:b]
+    end
+  end
+
   private
     def with_partial_updates(klass, on = true)
       old = klass.partial_updates?
-- 
cgit v1.2.3


From a5aad2e81febfa1a8d9fea0faffb5a3b4535982b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarmo=20T=C3=A4nav?= <tarmo@itech.ee>
Date: Wed, 13 Aug 2008 06:18:01 +0300
Subject: Fixed Time/Date object serialization

Time/Date objects used to be converted to_s instead of to_uaml
which made them unserializable.
---
 activerecord/test/cases/base_test.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 0f9eda4d09..36d30ade5e 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -1361,6 +1361,12 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal(myobj, topic.content)
   end
 
+  def test_serialized_time_attribute
+    myobj = Time.local(2008,1,1,1,0)
+    topic = Topic.create("content" => myobj).reload
+    assert_equal(myobj, topic.content)
+  end
+
   def test_nil_serialized_attribute_with_class_constraint
     myobj = MyObject.new('value1', 'value2')
     topic = Topic.new
-- 
cgit v1.2.3


From aae9f916590b8ce2c84a9e404584de95b1705766 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Wed, 13 Aug 2008 10:00:54 +0200
Subject: fix validations_i18n tests for changed locale file format

---
 activerecord/test/cases/validations_i18n_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index 89ca61a220..bf0a4c9829 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -11,7 +11,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   def teardown
     reset_callbacks Topic
-    load 'active_record/locale/en-US.rb'
+    I18n.load_translations File.dirname(__FILE__) + '/../../lib/active_record/locale/en-US.rb'
   end
   
   def unique_topic
-- 
cgit v1.2.3


From d0ee883e7c01dabf039525b80b7f43673e987265 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Wed, 13 Aug 2008 14:02:26 +0200
Subject: fixing unit tests for active_record validations_i18n

---
 activerecord/test/cases/validations_i18n_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index bf0a4c9829..a0beb8be1b 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -46,14 +46,14 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       global_scope = [:active_record, :error_messages]
       custom_scope = global_scope + [:custom, 'topic', :title]
   
-      I18n.expects(:t).with nil, :scope => [:active_record, :error_messages], :default => [:"custom.topic.title.invalid", 'default from class def', :invalid]
+      I18n.expects(:t).with :"custom.topic.title.invalid", :scope => [:active_record, :error_messages], :default => ['default from class def', :invalid]
       @topic.errors.generate_message :title, :invalid, :default => 'default from class def'
     end
   
     def test_errors_generate_message_translates_custom_model_attribute_keys_with_sti
       custom_scope = [:active_record, :error_messages, :custom, 'topic', :title]
   
-      I18n.expects(:t).with nil, :scope => [:active_record, :error_messages], :default => [:"custom.reply.title.invalid", :"custom.topic.title.invalid", 'default from class def', :invalid]
+      I18n.expects(:t).with :"custom.reply.title.invalid", :scope => [:active_record, :error_messages], :default => [:"custom.topic.title.invalid", 'default from class def', :invalid]
       Reply.new.errors.generate_message :title, :invalid, :default => 'default from class def'
     end
   
-- 
cgit v1.2.3


From 1ee9e3fa5c924bef4aba3d53796f48f5badbd06f Mon Sep 17 00:00:00 2001
From: Eloy Duran <eloy.de.enige@gmail.com>
Date: Wed, 13 Aug 2008 13:36:39 +0200
Subject: Fix ActiveRecord::NamedScope::Scope#respond_to? [#818 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 activerecord/test/cases/named_scope_test.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index 7bd712e11e..bd6ec23853 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -45,6 +45,12 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert_equal Topic.average(:replies_count), Topic.base.average(:replies_count)
   end
 
+  def test_scope_should_respond_to_own_methods_and_methods_of_the_proxy
+    assert Topic.approved.respond_to?(:proxy_found)
+    assert Topic.approved.respond_to?(:count)
+    assert Topic.approved.respond_to?(:length)
+  end
+
   def test_subclasses_inherit_scopes
     assert Topic.scopes.include?(:base)
 
-- 
cgit v1.2.3


From ffeab4e0c171aecced4ddbe29b82aed064be9bdb Mon Sep 17 00:00:00 2001
From: Iain Hecker <github@iain.nl>
Date: Thu, 14 Aug 2008 01:28:31 +0200
Subject: Cleaned up ActiveRecord i18n scoping

---
 activerecord/test/cases/validations_i18n_test.rb | 155 ++++++++++++-----------
 1 file changed, 80 insertions(+), 75 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index a0beb8be1b..e110595437 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -6,7 +6,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   def setup
     reset_callbacks Topic
     @topic = Topic.new
-    I18n.backend.store_translations('en-US', :active_record => {:error_messages => {:custom => nil}})
+    I18n.backend.store_translations('en-US', :activerecord => {:errors => {:messages => {:custom => nil}}})
   end
   
   def teardown
@@ -43,20 +43,23 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # ActiveRecord::Errors
   uses_mocha 'ActiveRecord::Errors' do
     def test_errors_generate_message_translates_custom_model_attribute_key
-      global_scope = [:active_record, :error_messages]
+      global_scope = [:activerecord, :errors, :messages]
       custom_scope = global_scope + [:custom, 'topic', :title]
-  
-      I18n.expects(:t).with :"custom.topic.title.invalid", :scope => [:active_record, :error_messages], :default => ['default from class def', :invalid]
-      @topic.errors.generate_message :title, :invalid, :default => 'default from class def'
+
+      I18n.expects(:translate).with('topic', {:count => 1, :default => 'Topic', :scope => [:activerecord, :models]}).returns('Topic')
+      I18n.expects(:translate).with(:'topic.title', {:count => 1, :default => ['Title'], :scope => [:activerecord, :attributes]}).returns('Title')
+      I18n.expects(:translate).with(:"custom.topic.title.invalid", :scope => global_scope, :default => [:"custom.topic.invalid", 'default from class def error 1', :invalid], :attribute => "Title", :model => "Topic").returns('default from class def error 1')
+      @topic.errors.generate_message :title, :invalid, :default => 'default from class def error 1'
     end
-  
+
     def test_errors_generate_message_translates_custom_model_attribute_keys_with_sti
-      custom_scope = [:active_record, :error_messages, :custom, 'topic', :title]
-  
-      I18n.expects(:t).with :"custom.reply.title.invalid", :scope => [:active_record, :error_messages], :default => [:"custom.topic.title.invalid", 'default from class def', :invalid]
+      custom_scope = [:activerecord, :errors, :custom, 'topic', :title]
+      I18n.expects(:translate).with('reply', {:count => 1, :default => 'Reply', :scope => [:activerecord, :models]}).returns('Reply')
+      I18n.expects(:translate).with(:'reply.title', {:count => 1, :default => [:'topic.title', 'Title'], :scope => [:activerecord, :attributes]}).returns('Title')
+      I18n.expects(:translate).with(:"custom.reply.title.invalid", :scope => [:activerecord, :errors, :messages], :default => [:"custom.reply.invalid", :"custom.topic.title.invalid", :"custom.topic.invalid", 'default from class def', :invalid], :model => 'Reply', :attribute => 'Title').returns("default from class def")
       Reply.new.errors.generate_message :title, :invalid, :default => 'default from class def'
     end
-  
+
     def test_errors_add_on_empty_generates_message
       @topic.errors.expects(:generate_message).with(:title, :empty, {:default => nil})
       @topic.errors.add_on_empty :title
@@ -79,7 +82,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
     def test_errors_full_messages_translates_human_attribute_name_for_model_attributes
       @topic.errors.instance_variable_set :@errors, { 'title' => 'empty' }
-      I18n.expects(:translate).with(:"active_record.human_attribute_names.topic.title", :locale => 'en-US', :default => 'Title').returns('Title')
+      I18n.expects(:translate).with(:"topic.title", :default => ['Title'], :scope => [:activerecord, :attributes], :count => 1).returns('Title')
       @topic.errors.full_messages :locale => 'en-US'
     end
   end  
@@ -344,8 +347,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_confirmation_of w/o mocha
   
   def test_validates_confirmation_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:confirmation => 'custom message'}}}}}
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:confirmation => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:confirmation => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:confirmation => 'global message'}}}
   
     Topic.validates_confirmation_of :title
     @topic.title_confirmation = 'foo'
@@ -354,7 +357,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_confirmation_of_finds_global_default_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:confirmation => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:confirmation => 'global message'}}}
   
     Topic.validates_confirmation_of :title
     @topic.title_confirmation = 'foo'
@@ -365,8 +368,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_acceptance_of w/o mocha
   
   def test_validates_acceptance_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:accepted => 'custom message'}}}}}
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:accepted => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:accepted => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:accepted => 'global message'}}}
   
     Topic.validates_acceptance_of :title, :allow_nil => false
     @topic.valid?
@@ -374,7 +377,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_acceptance_of_finds_global_default_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:accepted => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:accepted => 'global message'}}}
   
     Topic.validates_acceptance_of :title, :allow_nil => false
     @topic.valid?
@@ -384,8 +387,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_presence_of w/o mocha
     
   def test_validates_presence_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:blank => 'custom message'}}}}}
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:blank => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:blank => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:blank => 'global message'}}}
   
     Topic.validates_presence_of :title
     @topic.valid?
@@ -393,7 +396,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_presence_of_finds_global_default_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:blank => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:blank => 'global message'}}}
   
     Topic.validates_presence_of :title
     @topic.valid?
@@ -403,8 +406,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_length_of :within w/o mocha
   
   def test_validates_length_of_within_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:too_short => 'custom message'}}}}}
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:too_short => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:too_short => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:too_short => 'global message'}}}
   
     Topic.validates_length_of :title, :within => 3..5
     @topic.valid?
@@ -412,7 +415,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_length_of_within_finds_global_default_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:too_short => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:too_short => 'global message'}}}
   
     Topic.validates_length_of :title, :within => 3..5
     @topic.valid?
@@ -422,8 +425,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_length_of :is w/o mocha
   
   def test_validates_length_of_within_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
   
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
@@ -431,7 +434,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_length_of_within_finds_global_default_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
   
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
@@ -441,8 +444,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_uniqueness_of w/o mocha
   
   def test_validates_length_of_within_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
   
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
@@ -450,7 +453,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_length_of_within_finds_global_default_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:wrong_length => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
   
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
@@ -461,8 +464,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_format_of w/o mocha
   
   def test_validates_format_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:invalid => 'custom message'}}}}}
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:invalid => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
   
     Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
     @topic.valid?
@@ -470,7 +473,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_format_of_finds_global_default_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
   
     Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
     @topic.valid?
@@ -480,8 +483,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_inclusion_of w/o mocha
   
   def test_validates_inclusion_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:inclusion => 'custom message'}}}}}
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:inclusion => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:inclusion => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:inclusion => 'global message'}}}
   
     Topic.validates_inclusion_of :title, :in => %w(a b c)
     @topic.valid?
@@ -489,7 +492,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_inclusion_of_finds_global_default_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:inclusion => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:inclusion => 'global message'}}}
   
     Topic.validates_inclusion_of :title, :in => %w(a b c)
     @topic.valid?
@@ -499,8 +502,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_exclusion_of w/o mocha
   
   def test_validates_exclusion_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:exclusion => 'custom message'}}}}}
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:exclusion => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:exclusion => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:exclusion => 'global message'}}}
   
     Topic.validates_exclusion_of :title, :in => %w(a b c)
     @topic.title = 'a'
@@ -509,7 +512,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_exclusion_of_finds_global_default_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:exclusion => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:exclusion => 'global message'}}}
   
     Topic.validates_exclusion_of :title, :in => %w(a b c)
     @topic.title = 'a'
@@ -520,8 +523,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_numericality_of without :only_integer w/o mocha
   
   def test_validates_numericality_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:not_a_number => 'custom message'}}}}}
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:not_a_number => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:not_a_number => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:not_a_number => 'global message'}}}
   
     Topic.validates_numericality_of :title
     @topic.title = 'a'
@@ -530,7 +533,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_numericality_of_finds_global_default_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:not_a_number => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:not_a_number => 'global message'}}}
   
     Topic.validates_numericality_of :title, :only_integer => true
     @topic.title = 'a'
@@ -541,8 +544,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_numericality_of with :only_integer w/o mocha
   
   def test_validates_numericality_of_only_integer_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:not_a_number => 'custom message'}}}}}
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:not_a_number => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:not_a_number => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:not_a_number => 'global message'}}}
   
     Topic.validates_numericality_of :title, :only_integer => true
     @topic.title = 'a'
@@ -551,7 +554,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_numericality_of_only_integer_finds_global_default_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:not_a_number => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:not_a_number => 'global message'}}}
   
     Topic.validates_numericality_of :title, :only_integer => true
     @topic.title = 'a'
@@ -562,8 +565,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_numericality_of :odd w/o mocha
   
   def test_validates_numericality_of_odd_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:odd => 'custom message'}}}}}
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:odd => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:odd => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:odd => 'global message'}}}
   
     Topic.validates_numericality_of :title, :only_integer => true, :odd => true
     @topic.title = 0
@@ -572,7 +575,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_numericality_of_odd_finds_global_default_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:odd => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:odd => 'global message'}}}
   
     Topic.validates_numericality_of :title, :only_integer => true, :odd => true
     @topic.title = 0
@@ -583,8 +586,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_numericality_of :less_than w/o mocha
   
   def test_validates_numericality_of_less_than_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:title => {:less_than => 'custom message'}}}}}
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:less_than => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:less_than => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:less_than => 'global message'}}}
   
     Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
     @topic.title = 1
@@ -593,7 +596,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_numericality_of_less_than_finds_global_default_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:less_than => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:less_than => 'global message'}}}
   
     Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
     @topic.title = 1
@@ -605,8 +608,8 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_associated w/o mocha
   
   def test_validates_associated_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:custom => {:topic => {:replies => {:invalid => 'custom message'}}}}}
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:replies => {:invalid => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
   
     Topic.validates_associated :replies
     replied_topic.valid?
@@ -614,7 +617,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
   
   def test_validates_associated_finds_global_default_translation
-    I18n.backend.store_translations 'en-US', :active_record => {:error_messages => {:invalid => 'global message'}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
   
     Topic.validates_associated :replies
     replied_topic.valid?
@@ -627,27 +630,29 @@ class ActiveRecordValidationsGenerateMessageI18nTests < Test::Unit::TestCase
     reset_callbacks Topic
     @topic = Topic.new
     I18n.backend.store_translations :'en-US', {
-      :active_record => {
-        :error_messages => {
-          :inclusion => "is not included in the list",
-          :exclusion => "is reserved",
-          :invalid => "is invalid",
-          :confirmation => "doesn't match confirmation",
-          :accepted  => "must be accepted",
-          :empty => "can't be empty",
-          :blank => "can't be blank",
-          :too_long => "is too long (maximum is {{count}} characters)",
-          :too_short => "is too short (minimum is {{count}} characters)",
-          :wrong_length => "is the wrong length (should be {{count}} characters)",
-          :taken => "has already been taken",
-          :not_a_number => "is not a number",
-          :greater_than => "must be greater than {{count}}",
-          :greater_than_or_equal_to => "must be greater than or equal to {{count}}",
-          :equal_to => "must be equal to {{count}}",
-          :less_than => "must be less than {{count}}",
-          :less_than_or_equal_to => "must be less than or equal to {{count}}",
-          :odd => "must be odd",
-          :even => "must be even"
+      :activerecord => {
+        :errors => {
+          :messages => {
+            :inclusion => "is not included in the list",
+            :exclusion => "is reserved",
+            :invalid => "is invalid",
+            :confirmation => "doesn't match confirmation",
+            :accepted  => "must be accepted",
+            :empty => "can't be empty",
+            :blank => "can't be blank",
+            :too_long => "is too long (maximum is {{count}} characters)",
+            :too_short => "is too short (minimum is {{count}} characters)",
+            :wrong_length => "is the wrong length (should be {{count}} characters)",
+            :taken => "has already been taken",
+            :not_a_number => "is not a number",
+            :greater_than => "must be greater than {{count}}",
+            :greater_than_or_equal_to => "must be greater than or equal to {{count}}",
+            :equal_to => "must be equal to {{count}}",
+            :less_than => "must be less than {{count}}",
+            :less_than_or_equal_to => "must be less than or equal to {{count}}",
+            :odd => "must be odd",
+            :even => "must be even"
+          }
         }            
       }
     }
@@ -798,4 +803,4 @@ class ActiveRecordValidationsGenerateMessageI18nTests < Test::Unit::TestCase
   def test_generate_message_even_with_default_message
     assert_equal "must be even", @topic.errors.generate_message(:title, :even, :default => nil, :value => 'title', :count => 10)
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From 8f4d3957a6986fe450cfd9058bb92ae1d6e5e745 Mon Sep 17 00:00:00 2001
From: Ryan Bates <ryan@railscasts.com>
Date: Fri, 15 Aug 2008 13:51:57 -0700
Subject: Don't raise exception when comparing ActiveRecord::Reflection. [#842
 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 activerecord/test/cases/reflection_test.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb
index 723062e3b8..4b86e32dbf 100644
--- a/activerecord/test/cases/reflection_test.rb
+++ b/activerecord/test/cases/reflection_test.rb
@@ -166,6 +166,10 @@ class ReflectionTest < ActiveRecord::TestCase
     assert_equal 0, Firm.reflect_on_all_associations(:belongs_to).size
   end
 
+  def test_reflection_should_not_raise_error_when_compared_to_other_object
+    assert_nothing_raised { Firm.reflections[:clients] == Object.new }
+  end
+
   private
     def assert_reflection(klass, association, options)
       assert reflection = klass.reflect_on_association(association)
-- 
cgit v1.2.3


From 2b69a636c431d62a85b2896d87b69cb13e2b8af0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarmo=20T=C3=A4nav?= <tarmo@itech.ee>
Date: Sat, 16 Aug 2008 02:24:29 +0300
Subject: Fixed STI type condition for eager loading of associations

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 .../test/cases/associations/cascaded_eager_loading_test.rb   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/cascaded_eager_loading_test.rb b/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
index 1f8a1090eb..8c9ae8a031 100644
--- a/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
+++ b/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
@@ -68,6 +68,18 @@ class CascadedEagerLoadingTest < ActiveRecord::TestCase
     end
   end
 
+  def test_eager_association_loading_with_has_many_sti_and_subclasses
+    silly = SillyReply.new(:title => "gaga", :content => "boo-boo", :parent_id => 1)
+    silly.parent_id = 1
+    assert silly.save
+
+    topics = Topic.find(:all, :include => :replies, :order => 'topics.id, replies_topics.id')
+    assert_no_queries do
+      assert_equal 2, topics[0].replies.size
+      assert_equal 0, topics[1].replies.size
+    end
+  end
+
   def test_eager_association_loading_with_belongs_to_sti
     replies = Reply.find(:all, :include => :topic, :order => 'topics.id')
     assert replies.include?(topics(:second))
-- 
cgit v1.2.3


From 8cfdcdb35db6e2f6fd5a72a38f4352beab148af1 Mon Sep 17 00:00:00 2001
From: Nathan Witmer <nwitmer@gmail.com>
Date: Sat, 16 Aug 2008 13:38:01 -0600
Subject: Updated has_and_belongs_to_many association to fix :finder_sql
 interpolation. [#848 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 .../associations/has_and_belongs_to_many_associations_test.rb      | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
index f71b122ff0..dfd82534ff 100644
--- a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
@@ -450,6 +450,13 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     assert_equal developers(:david), active_record.developers_with_finder_sql.find(developers(:david).id), "Ruby find"
   end
 
+  def test_find_in_association_with_custom_finder_sql_and_multiple_interpolations
+    # interpolate once:
+    assert_equal [developers(:david), developers(:poor_jamis), developers(:jamis)], projects(:active_record).developers_with_finder_sql, "first interpolation"
+    # interpolate again, for a different project id
+    assert_equal [developers(:david)], projects(:action_controller).developers_with_finder_sql, "second interpolation"
+  end
+
   def test_find_in_association_with_custom_finder_sql_and_string_id
     assert_equal developers(:david), projects(:active_record).developers_with_finder_sql.find(developers(:david).id.to_s), "SQL find"
   end
-- 
cgit v1.2.3


From 96607996eaa826b5299780c7c9142e6e0157d198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarmo=20T=C3=A4nav?= <tarmo@itech.ee>
Date: Sun, 17 Aug 2008 00:20:55 +0300
Subject: Test for eager loading of STI subclasses from htm associations

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 activerecord/test/cases/associations/join_model_test.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb
index 9e79d9c8a1..7a0427aabc 100644
--- a/activerecord/test/cases/associations/join_model_test.rb
+++ b/activerecord/test/cases/associations/join_model_test.rb
@@ -694,6 +694,13 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
     assert ! david.categories.include?(category)
   end
 
+  def test_has_many_through_goes_through_all_sti_classes
+    sub_sti_post = SubStiPost.create!(:title => 'test', :body => 'test', :author_id => 1)
+    new_comment = sub_sti_post.comments.create(:body => 'test')
+
+    assert_equal [9, 10, new_comment.id], authors(:david).sti_post_comments.map(&:id).sort
+  end
+
   private
     # create dynamic Post models to allow different dependency options
     def find_post_with_dependency(post_id, association, association_name, dependency)
-- 
cgit v1.2.3


From ae8a35d8f6d5db6ae9a1877918d45c15d21e24fe Mon Sep 17 00:00:00 2001
From: Iain Hecker <github@iain.nl>
Date: Sat, 16 Aug 2008 20:01:42 +0200
Subject: Added Base.human_name method

---
 activerecord/test/cases/i18n_test.rb | 46 ++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 activerecord/test/cases/i18n_test.rb

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/i18n_test.rb b/activerecord/test/cases/i18n_test.rb
new file mode 100644
index 0000000000..3527644f0d
--- /dev/null
+++ b/activerecord/test/cases/i18n_test.rb
@@ -0,0 +1,46 @@
+require "cases/helper"
+require 'models/topic'
+require 'models/reply'
+
+class ActiveRecordI18nTests < Test::Unit::TestCase
+
+  def setup
+    reset_translations
+  end
+  
+  def test_translated_model_attributes
+    I18n.store_translations 'en-US', :activerecord => {:attributes => {:topic => {:title => 'topic title attribute'} } }
+    assert_equal 'topic title attribute', Topic.human_attribute_name('title')
+  end
+
+  def test_translated_model_attributes_with_sti
+    I18n.store_translations 'en-US', :activerecord => {:attributes => {:reply => {:title => 'reply title attribute'} } }
+    assert_equal 'reply title attribute', Reply.human_attribute_name('title')
+  end
+
+  def test_translated_model_attributes_with_sti_fallback
+    I18n.store_translations 'en-US', :activerecord => {:attributes => {:topic => {:title => 'topic title attribute'} } }
+    assert_equal 'topic title attribute', Reply.human_attribute_name('title')
+  end
+
+  def test_translated_model_names
+    I18n.store_translations 'en-US', :activerecord => {:models => {:topic => 'topic model'} }
+    assert_equal 'topic model', Topic.human_name
+  end
+
+  def test_translated_model_names_with_sti
+    I18n.store_translations 'en-US', :activerecord => {:models => {:reply => 'reply model'} }
+    assert_equal 'reply model', Reply.human_name
+  end
+
+  def test_translated_model_names_with_sti_fallback
+    I18n.store_translations 'en-US', :activerecord => {:models => {:topic => 'topic model'} }
+    assert_equal 'topic model', Reply.human_name
+  end
+
+  private
+  def reset_translations
+    I18n.backend.send(:class_variable_set, :@@translations, {})
+  end
+end
+
-- 
cgit v1.2.3


From c531248938302477c5e52138d59a6c3d1527d963 Mon Sep 17 00:00:00 2001
From: Iain Hecker <github@iain.nl>
Date: Sat, 16 Aug 2008 20:22:40 +0200
Subject: Introduced AR::Base.human_name to validations

---
 activerecord/test/cases/validations_i18n_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index e110595437..96f86fbe0e 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -46,7 +46,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       global_scope = [:activerecord, :errors, :messages]
       custom_scope = global_scope + [:custom, 'topic', :title]
 
-      I18n.expects(:translate).with('topic', {:count => 1, :default => 'Topic', :scope => [:activerecord, :models]}).returns('Topic')
+      I18n.expects(:translate).with(:topic, {:count => 1, :default => ['Topic'], :scope => [:activerecord, :models]}).returns('Topic')
       I18n.expects(:translate).with(:'topic.title', {:count => 1, :default => ['Title'], :scope => [:activerecord, :attributes]}).returns('Title')
       I18n.expects(:translate).with(:"custom.topic.title.invalid", :scope => global_scope, :default => [:"custom.topic.invalid", 'default from class def error 1', :invalid], :attribute => "Title", :model => "Topic").returns('default from class def error 1')
       @topic.errors.generate_message :title, :invalid, :default => 'default from class def error 1'
@@ -54,7 +54,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
 
     def test_errors_generate_message_translates_custom_model_attribute_keys_with_sti
       custom_scope = [:activerecord, :errors, :custom, 'topic', :title]
-      I18n.expects(:translate).with('reply', {:count => 1, :default => 'Reply', :scope => [:activerecord, :models]}).returns('Reply')
+      I18n.expects(:translate).with(:reply, {:count => 1, :default => [:topic, 'Reply'], :scope => [:activerecord, :models]}).returns('Reply')
       I18n.expects(:translate).with(:'reply.title', {:count => 1, :default => [:'topic.title', 'Title'], :scope => [:activerecord, :attributes]}).returns('Title')
       I18n.expects(:translate).with(:"custom.reply.title.invalid", :scope => [:activerecord, :errors, :messages], :default => [:"custom.reply.invalid", :"custom.topic.title.invalid", :"custom.topic.invalid", 'default from class def', :invalid], :model => 'Reply', :attribute => 'Title').returns("default from class def")
       Reply.new.errors.generate_message :title, :invalid, :default => 'default from class def'
-- 
cgit v1.2.3


From e2b191681e1c8c8b4344f1fc755e48fccdd1d603 Mon Sep 17 00:00:00 2001
From: Iain Hecker <github@iain.nl>
Date: Sat, 16 Aug 2008 21:45:23 +0200
Subject: Added :value as interpolation variable available to error messages

---
 activerecord/test/cases/validations_i18n_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index 96f86fbe0e..469e9d6c03 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -48,7 +48,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
 
       I18n.expects(:translate).with(:topic, {:count => 1, :default => ['Topic'], :scope => [:activerecord, :models]}).returns('Topic')
       I18n.expects(:translate).with(:'topic.title', {:count => 1, :default => ['Title'], :scope => [:activerecord, :attributes]}).returns('Title')
-      I18n.expects(:translate).with(:"custom.topic.title.invalid", :scope => global_scope, :default => [:"custom.topic.invalid", 'default from class def error 1', :invalid], :attribute => "Title", :model => "Topic").returns('default from class def error 1')
+      I18n.expects(:translate).with(:"custom.topic.title.invalid", :value => nil, :scope => global_scope, :default => [:"custom.topic.invalid", 'default from class def error 1', :invalid], :attribute => "Title", :model => "Topic").returns('default from class def error 1')
       @topic.errors.generate_message :title, :invalid, :default => 'default from class def error 1'
     end
 
@@ -56,7 +56,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       custom_scope = [:activerecord, :errors, :custom, 'topic', :title]
       I18n.expects(:translate).with(:reply, {:count => 1, :default => [:topic, 'Reply'], :scope => [:activerecord, :models]}).returns('Reply')
       I18n.expects(:translate).with(:'reply.title', {:count => 1, :default => [:'topic.title', 'Title'], :scope => [:activerecord, :attributes]}).returns('Title')
-      I18n.expects(:translate).with(:"custom.reply.title.invalid", :scope => [:activerecord, :errors, :messages], :default => [:"custom.reply.invalid", :"custom.topic.title.invalid", :"custom.topic.invalid", 'default from class def', :invalid], :model => 'Reply', :attribute => 'Title').returns("default from class def")
+      I18n.expects(:translate).with(:"custom.reply.title.invalid", :value => nil, :scope => [:activerecord, :errors, :messages], :default => [:"custom.reply.invalid", :"custom.topic.title.invalid", :"custom.topic.invalid", 'default from class def', :invalid], :model => 'Reply', :attribute => 'Title').returns("default from class def")
       Reply.new.errors.generate_message :title, :invalid, :default => 'default from class def'
     end
 
-- 
cgit v1.2.3


From a6a62004c93d792c230d80f8a65da0bb45cb369f Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Wed, 20 Aug 2008 17:51:42 +0200
Subject: add human_name and value to ar validation #generate_message

---
 activerecord/test/cases/i18n_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/i18n_test.rb b/activerecord/test/cases/i18n_test.rb
index 3527644f0d..06036733f5 100644
--- a/activerecord/test/cases/i18n_test.rb
+++ b/activerecord/test/cases/i18n_test.rb
@@ -39,8 +39,8 @@ class ActiveRecordI18nTests < Test::Unit::TestCase
   end
 
   private
-  def reset_translations
-    I18n.backend.send(:class_variable_set, :@@translations, {})
-  end
+    def reset_translations
+      I18n.backend = I18n::Backend::Simple.new
+    end
 end
 
-- 
cgit v1.2.3


From febe2ea9775c863cb9744c6343291e550e4628b8 Mon Sep 17 00:00:00 2001
From: Iain Hecker <github@iain.nl>
Date: Tue, 19 Aug 2008 23:19:57 +0200
Subject: Locale file changed to yaml

---
 activerecord/test/cases/validations_i18n_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index 469e9d6c03..96af3b17a6 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -11,7 +11,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   def teardown
     reset_callbacks Topic
-    I18n.load_translations File.dirname(__FILE__) + '/../../lib/active_record/locale/en-US.rb'
+    I18n.load_translations File.dirname(__FILE__) + '/../../lib/active_record/locale/en-US.yml'
   end
   
   def unique_topic
-- 
cgit v1.2.3


From 2415652660242d6b0da97119c562ecff82928575 Mon Sep 17 00:00:00 2001
From: Ryan Bates <ryan@railscasts.com>
Date: Thu, 21 Aug 2008 12:37:19 +0100
Subject: Support find_all on named scopes. [#730 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 activerecord/test/cases/named_scope_test.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index bd6ec23853..7cc51f5d68 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -238,4 +238,8 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert topic.approved
     assert_equal 'lifo', topic.author_name
   end
+
+  def test_find_all_should_behave_like_select
+    assert_equal Topic.base.select(&:approved), Topic.base.find_all(&:approved)
+  end
 end
-- 
cgit v1.2.3


From ea40f71431a821b2ddb37be6ea3ee7d8dac63b85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Ku=C5=BAma?= <kuba@ibm.(none)>
Date: Thu, 21 Aug 2008 12:55:35 +0200
Subject: Fix that has_one natural assignment to already associated record.
 [#854 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 .../test/cases/associations/has_one_associations_test.rb       | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/has_one_associations_test.rb b/activerecord/test/cases/associations/has_one_associations_test.rb
index 99639849a5..ec06be5eba 100644
--- a/activerecord/test/cases/associations/has_one_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_associations_test.rb
@@ -79,6 +79,16 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
     assert_raises(ActiveRecord::RecordNotFound) { Account.find(old_account_id) }
   end
 
+  def test_natural_assignment_to_already_associated_record
+    company = companies(:first_firm)
+    account = accounts(:signals37)
+    assert_equal company.account, account
+    company.account = account
+    company.reload
+    account.reload
+    assert_equal company.account, account
+  end
+
   def test_assignment_without_replacement
     apple = Firm.create("name" => "Apple")
     citibank = Account.create("credit_limit" => 10)
-- 
cgit v1.2.3


From a970f916fb1e05376733e2d42d9bcc2b873af355 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Thu, 21 Aug 2008 15:45:06 +0100
Subject: Fix has_many#count_records. [#865 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 .../test/cases/associations/has_many_associations_test.rb    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index b806e885e1..da3c8fb28e 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -395,6 +395,18 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 3, company.clients_of_firm.size
   end
 
+  def test_collection_size_twice_for_regressions
+    post = posts(:thinking)
+    assert_equal 0, post.readers.size
+    # This test needs a post that has no readers, we assert it to ensure it holds,
+    # but need to reload the post because the very call to #size hides the bug.
+    post.reload
+    post.readers.build
+    size1 = post.readers.size
+    size2 = post.readers.size
+    assert_equal size1, size2
+  end
+
   def test_build_many
     company = companies(:first_firm)
     new_clients = assert_no_queries { company.clients_of_firm.build([{"name" => "Another Client"}, {"name" => "Another Client II"}]) }
-- 
cgit v1.2.3


From 49c0e1e594c95d7e8446ebabecc9147afa62de7d Mon Sep 17 00:00:00 2001
From: Philip Hallstrom <philip@pjkh.com>
Date: Thu, 21 Aug 2008 16:08:42 +0100
Subject: Fix generated WHERE IN query for named scopes. [#583 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 activerecord/test/cases/named_scope_test.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index 7cc51f5d68..db31ddb293 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -4,6 +4,7 @@ require 'models/topic'
 require 'models/comment'
 require 'models/reply'
 require 'models/author'
+require 'models/developer'
 
 class NamedScopeTest < ActiveRecord::TestCase
   fixtures :posts, :authors, :topics, :comments, :author_addresses
@@ -242,4 +243,8 @@ class NamedScopeTest < ActiveRecord::TestCase
   def test_find_all_should_behave_like_select
     assert_equal Topic.base.select(&:approved), Topic.base.find_all(&:approved)
   end
+
+  def test_should_use_where_in_query_for_named_scope
+    assert_equal Developer.find_all_by_name('Jamis'), Developer.find_all_by_id(Developer.jamises)
+  end
 end
-- 
cgit v1.2.3


From 3724dafe71f4afb2ca9f4d7d2526b228aa6c05a3 Mon Sep 17 00:00:00 2001
From: Tom Lea <contrib@tomlea.co.uk>
Date: Thu, 21 Aug 2008 16:38:27 +0100
Subject: Fix incorrect signature for NamedScope#respond_to? [#852
 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 activerecord/test/cases/named_scope_test.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index db31ddb293..6f6ea1cbe9 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -52,6 +52,11 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert Topic.approved.respond_to?(:length)
   end
 
+  def test_respond_to_respects_include_private_parameter
+    assert !Topic.approved.respond_to?(:load_found)
+    assert Topic.approved.respond_to?(:load_found, true)
+  end
+
   def test_subclasses_inherit_scopes
     assert Topic.scopes.include?(:base)
 
-- 
cgit v1.2.3


From 8622787f8748434b4ceb2b925a35b17a38e1f2d6 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 2 Jul 2008 21:27:42 -0400
Subject: Don't interpret decimals as table names in
 ActiveRecord::Associations::ClassMethods#references_eager_loaded_tables?
 [#532 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 activerecord/test/cases/associations/eager_test.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 58506574f8..f37e18df35 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -559,6 +559,13 @@ class EagerAssociationTest < ActiveRecord::TestCase
     assert_nothing_raised { Post.find(:all, :include => 'comments') }
   end
 
+  def test_eager_with_floating_point_numbers
+    assert_queries(2) do
+      # Before changes, the floating point numbers will be interpreted as table names and will cause this to run in one query
+      Comment.find :all, :conditions => "123.456 = 123.456", :include => :post
+    end
+  end
+
   def test_preconfigured_includes_with_belongs_to
     author = posts(:welcome).author_with_posts
     assert_no_queries {assert_equal 5, author.posts.size}
-- 
cgit v1.2.3


From cf6840773b4f5046151f4d28c286069aabaafa10 Mon Sep 17 00:00:00 2001
From: Iain Hecker <github@iain.nl>
Date: Wed, 20 Aug 2008 23:43:46 +0200
Subject: Custom error messages scope improved

---
 activerecord/test/cases/validations_i18n_test.rb | 98 ++++++++++++++++++------
 1 file changed, 75 insertions(+), 23 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index 96af3b17a6..881f219112 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -42,22 +42,74 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   # ActiveRecord::Errors
   uses_mocha 'ActiveRecord::Errors' do
+
     def test_errors_generate_message_translates_custom_model_attribute_key
-      global_scope = [:activerecord, :errors, :messages]
-      custom_scope = global_scope + [:custom, 'topic', :title]
 
-      I18n.expects(:translate).with(:topic, {:count => 1, :default => ['Topic'], :scope => [:activerecord, :models]}).returns('Topic')
-      I18n.expects(:translate).with(:'topic.title', {:count => 1, :default => ['Title'], :scope => [:activerecord, :attributes]}).returns('Title')
-      I18n.expects(:translate).with(:"custom.topic.title.invalid", :value => nil, :scope => global_scope, :default => [:"custom.topic.invalid", 'default from class def error 1', :invalid], :attribute => "Title", :model => "Topic").returns('default from class def error 1')
+      I18n.expects(:translate).with(
+        :topic, 
+        { :count => 1, 
+          :default => ['Topic'], 
+          :scope => [:activerecord, :models]
+        }
+      ).returns('Topic')
+
+      I18n.expects(:translate).with(
+        :"topic.title", 
+        { :count => 1, 
+          :default => ['Title'], 
+          :scope => [:activerecord, :attributes]
+        }
+      ).returns('Title')
+
+      I18n.expects(:translate).with(
+        :"models.topic.attributes.title.invalid", 
+        :value => nil, 
+        :scope => [:activerecord, :errors], 
+        :default => [
+          :"models.topic.invalid", 
+          'default from class def error 1', 
+          :"messages.invalid"], 
+        :attribute => "Title", 
+        :model => "Topic"
+      ).returns('default from class def error 1')
+
       @topic.errors.generate_message :title, :invalid, :default => 'default from class def error 1'
     end
 
     def test_errors_generate_message_translates_custom_model_attribute_keys_with_sti
-      custom_scope = [:activerecord, :errors, :custom, 'topic', :title]
-      I18n.expects(:translate).with(:reply, {:count => 1, :default => [:topic, 'Reply'], :scope => [:activerecord, :models]}).returns('Reply')
-      I18n.expects(:translate).with(:'reply.title', {:count => 1, :default => [:'topic.title', 'Title'], :scope => [:activerecord, :attributes]}).returns('Title')
-      I18n.expects(:translate).with(:"custom.reply.title.invalid", :value => nil, :scope => [:activerecord, :errors, :messages], :default => [:"custom.reply.invalid", :"custom.topic.title.invalid", :"custom.topic.invalid", 'default from class def', :invalid], :model => 'Reply', :attribute => 'Title').returns("default from class def")
+
+      I18n.expects(:translate).with(
+        :reply, 
+        { :count => 1, 
+          :default => [:topic, 'Reply'], 
+          :scope => [:activerecord, :models]
+        }
+      ).returns('Reply')
+
+      I18n.expects(:translate).with(
+        :"reply.title", 
+        { :count => 1, 
+          :default => [:'topic.title', 'Title'], 
+          :scope => [:activerecord, :attributes]
+        }
+      ).returns('Title')
+      
+      I18n.expects(:translate).with(
+        :"models.reply.attributes.title.invalid", 
+        :value => nil, 
+        :scope => [:activerecord, :errors], 
+        :default => [
+          :"models.reply.invalid", 
+          :"models.topic.attributes.title.invalid", 
+          :"models.topic.invalid", 
+          'default from class def', 
+          :"messages.invalid"], 
+        :model => 'Reply', 
+        :attribute => 'Title'
+      ).returns("default from class def")
+      
       Reply.new.errors.generate_message :title, :invalid, :default => 'default from class def'
+    
     end
 
     def test_errors_add_on_empty_generates_message
@@ -347,7 +399,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_confirmation_of w/o mocha
   
   def test_validates_confirmation_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:confirmation => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:confirmation => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:confirmation => 'global message'}}}
   
     Topic.validates_confirmation_of :title
@@ -368,7 +420,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_acceptance_of w/o mocha
   
   def test_validates_acceptance_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:accepted => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:accepted => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:accepted => 'global message'}}}
   
     Topic.validates_acceptance_of :title, :allow_nil => false
@@ -387,7 +439,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_presence_of w/o mocha
     
   def test_validates_presence_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:blank => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:blank => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:blank => 'global message'}}}
   
     Topic.validates_presence_of :title
@@ -406,7 +458,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_length_of :within w/o mocha
   
   def test_validates_length_of_within_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:too_short => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:too_short => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:too_short => 'global message'}}}
   
     Topic.validates_length_of :title, :within => 3..5
@@ -425,7 +477,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_length_of :is w/o mocha
   
   def test_validates_length_of_within_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:wrong_length => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
   
     Topic.validates_length_of :title, :is => 5
@@ -444,7 +496,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_uniqueness_of w/o mocha
   
   def test_validates_length_of_within_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:wrong_length => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:wrong_length => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
   
     Topic.validates_length_of :title, :is => 5
@@ -464,7 +516,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_format_of w/o mocha
   
   def test_validates_format_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:invalid => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:invalid => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
   
     Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
@@ -483,7 +535,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_inclusion_of w/o mocha
   
   def test_validates_inclusion_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:inclusion => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:inclusion => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:inclusion => 'global message'}}}
   
     Topic.validates_inclusion_of :title, :in => %w(a b c)
@@ -502,7 +554,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_exclusion_of w/o mocha
   
   def test_validates_exclusion_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:exclusion => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:exclusion => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:exclusion => 'global message'}}}
   
     Topic.validates_exclusion_of :title, :in => %w(a b c)
@@ -523,7 +575,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_numericality_of without :only_integer w/o mocha
   
   def test_validates_numericality_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:not_a_number => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:not_a_number => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:not_a_number => 'global message'}}}
   
     Topic.validates_numericality_of :title
@@ -544,7 +596,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_numericality_of with :only_integer w/o mocha
   
   def test_validates_numericality_of_only_integer_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:not_a_number => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:not_a_number => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:not_a_number => 'global message'}}}
   
     Topic.validates_numericality_of :title, :only_integer => true
@@ -565,7 +617,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_numericality_of :odd w/o mocha
   
   def test_validates_numericality_of_odd_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:odd => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:odd => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:odd => 'global message'}}}
   
     Topic.validates_numericality_of :title, :only_integer => true, :odd => true
@@ -586,7 +638,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_numericality_of :less_than w/o mocha
   
   def test_validates_numericality_of_less_than_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:title => {:less_than => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:less_than => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:less_than => 'global message'}}}
   
     Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
@@ -608,7 +660,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   # validates_associated w/o mocha
   
   def test_validates_associated_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:custom => {:topic => {:replies => {:invalid => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:replies => {:invalid => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
   
     Topic.validates_associated :replies
-- 
cgit v1.2.3


From aee14630d4dc0856e597794cc731fac68c2d2e34 Mon Sep 17 00:00:00 2001
From: Josh Susser <josh@hasmanythrough.com>
Date: Mon, 18 Aug 2008 15:56:37 -0700
Subject: coerce blank strings to nil values for boolean and integer fields

Signed-off-by: Michael Koziarski <michael@koziarski.com>
---
 activerecord/test/cases/validations_test.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_test.rb b/activerecord/test/cases/validations_test.rb
index 4b2d28c80b..a40bda2533 100644
--- a/activerecord/test/cases/validations_test.rb
+++ b/activerecord/test/cases/validations_test.rb
@@ -1420,8 +1420,8 @@ class ValidatesNumericalityTest < ActiveRecord::TestCase
   def test_validates_numericality_of_with_nil_allowed
     Topic.validates_numericality_of :approved, :allow_nil => true
 
-    invalid!(BLANK + JUNK)
-    valid!(NIL + FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
+    invalid!(JUNK)
+    valid!(NIL + BLANK + FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
   end
 
   def test_validates_numericality_of_with_integer_only
@@ -1434,8 +1434,8 @@ class ValidatesNumericalityTest < ActiveRecord::TestCase
   def test_validates_numericality_of_with_integer_only_and_nil_allowed
     Topic.validates_numericality_of :approved, :only_integer => true, :allow_nil => true
 
-    invalid!(BLANK + JUNK + FLOATS + BIGDECIMAL + INFINITY)
-    valid!(NIL + INTEGERS)
+    invalid!(JUNK + FLOATS + BIGDECIMAL + INFINITY)
+    valid!(NIL + BLANK + INTEGERS)
   end
 
   def test_validates_numericality_with_greater_than
-- 
cgit v1.2.3


From bbedb6a624a3d9eb02e0470f31cda8112df06d75 Mon Sep 17 00:00:00 2001
From: "S. Brent Faulkner" <brentf@unwwwired.net>
Date: Sun, 17 Aug 2008 20:43:15 -0400
Subject: remember created records and select a random one instead of relying
 on sequential id values starting at 1

Signed-off-by: Michael Koziarski <michael@koziarski.com>
---
 .../associations/eager_load_nested_include_test.rb | 42 +++++++++++++++-------
 1 file changed, 30 insertions(+), 12 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/eager_load_nested_include_test.rb b/activerecord/test/cases/associations/eager_load_nested_include_test.rb
index 80cfc84b32..12dec5ccd1 100644
--- a/activerecord/test/cases/associations/eager_load_nested_include_test.rb
+++ b/activerecord/test/cases/associations/eager_load_nested_include_test.rb
@@ -1,5 +1,20 @@
 require 'cases/helper'
 
+module Remembered
+  def self.included(base)
+    base.extend ClassMethods
+    base.class_eval do
+      after_create :remember
+    protected
+      def remember; self.class.remembered << self; end
+    end
+  end
+
+  module ClassMethods
+    def remembered; @@remembered ||= []; end
+    def rand; @@remembered.rand; end
+  end
+end
 
 class ShapeExpression < ActiveRecord::Base
   belongs_to :shape, :polymorphic => true
@@ -8,26 +23,33 @@ end
 
 class Circle < ActiveRecord::Base
   has_many :shape_expressions, :as => :shape
+  include Remembered
 end
 class Square < ActiveRecord::Base
   has_many :shape_expressions, :as => :shape
+  include Remembered
 end
 class Triangle < ActiveRecord::Base
   has_many :shape_expressions, :as => :shape
+  include Remembered
 end
 class PaintColor  < ActiveRecord::Base
   has_many   :shape_expressions, :as => :paint
   belongs_to :non_poly, :foreign_key => "non_poly_one_id", :class_name => "NonPolyOne"
+  include Remembered
 end
 class PaintTexture < ActiveRecord::Base
   has_many   :shape_expressions, :as => :paint
   belongs_to :non_poly, :foreign_key => "non_poly_two_id", :class_name => "NonPolyTwo"
+  include Remembered
 end
 class NonPolyOne < ActiveRecord::Base
   has_many :paint_colors
+  include Remembered
 end
 class NonPolyTwo < ActiveRecord::Base
   has_many :paint_textures
+  include Remembered
 end
 
 
@@ -49,23 +71,19 @@ class EagerLoadPolyAssocsTest < ActiveRecord::TestCase
   end
 
 
-  # meant to be supplied as an ID, never returns 0
-  def rand_simple
-    val = (NUM_SIMPLE_OBJS * rand).round
-    val == 0 ? 1 : val
-  end
-
   def generate_test_object_graphs
     1.upto(NUM_SIMPLE_OBJS) do
       [Circle, Square, Triangle, NonPolyOne, NonPolyTwo].map(&:create!)
     end
-    1.upto(NUM_SIMPLE_OBJS) do |i|
-      PaintColor.create!(:non_poly_one_id => rand_simple)
-      PaintTexture.create!(:non_poly_two_id => rand_simple)
+    1.upto(NUM_SIMPLE_OBJS) do
+      PaintColor.create!(:non_poly_one_id => NonPolyOne.rand.id)
+      PaintTexture.create!(:non_poly_two_id => NonPolyTwo.rand.id)
     end
-    1.upto(NUM_SHAPE_EXPRESSIONS) do |i|
-      ShapeExpression.create!(:shape_type => [Circle, Square, Triangle].rand.to_s, :shape_id => rand_simple,
-                              :paint_type => [PaintColor, PaintTexture].rand.to_s, :paint_id => rand_simple)
+    1.upto(NUM_SHAPE_EXPRESSIONS) do
+      shape_type = [Circle, Square, Triangle].rand
+      paint_type = [PaintColor, PaintTexture].rand
+      ShapeExpression.create!(:shape_type => shape_type.to_s, :shape_id => shape_type.rand.id,
+                              :paint_type => paint_type.to_s, :paint_id => paint_type.rand.id)
     end
   end
 
-- 
cgit v1.2.3


From a5eb297424f68583636b762686726bc0c84703c0 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 21 Aug 2008 21:34:17 -0700
Subject: Revert "coerce blank strings to nil values for boolean and integer
 fields"

This reverts commit aee14630d4dc0856e597794cc731fac68c2d2e34.

[#860 state:incomplete]
---
 activerecord/test/cases/validations_test.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_test.rb b/activerecord/test/cases/validations_test.rb
index a40bda2533..4b2d28c80b 100644
--- a/activerecord/test/cases/validations_test.rb
+++ b/activerecord/test/cases/validations_test.rb
@@ -1420,8 +1420,8 @@ class ValidatesNumericalityTest < ActiveRecord::TestCase
   def test_validates_numericality_of_with_nil_allowed
     Topic.validates_numericality_of :approved, :allow_nil => true
 
-    invalid!(JUNK)
-    valid!(NIL + BLANK + FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
+    invalid!(BLANK + JUNK)
+    valid!(NIL + FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
   end
 
   def test_validates_numericality_of_with_integer_only
@@ -1434,8 +1434,8 @@ class ValidatesNumericalityTest < ActiveRecord::TestCase
   def test_validates_numericality_of_with_integer_only_and_nil_allowed
     Topic.validates_numericality_of :approved, :only_integer => true, :allow_nil => true
 
-    invalid!(JUNK + FLOATS + BIGDECIMAL + INFINITY)
-    valid!(NIL + BLANK + INTEGERS)
+    invalid!(BLANK + JUNK + FLOATS + BIGDECIMAL + INFINITY)
+    valid!(NIL + INTEGERS)
   end
 
   def test_validates_numericality_with_greater_than
-- 
cgit v1.2.3


From 52ac9d04442296abe7f05fc4701e1be7a0eed1f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarmo=20T=C3=A4nav?= <tarmo@itech.ee>
Date: Fri, 22 Aug 2008 09:53:59 +0300
Subject: Fixed ordering in
 test_find_in_association_with_custom_finder_sql_and_multiple_interpolations

---
 .../cases/associations/has_and_belongs_to_many_associations_test.rb     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
index dfd82534ff..432d245b5b 100644
--- a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
@@ -452,7 +452,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
 
   def test_find_in_association_with_custom_finder_sql_and_multiple_interpolations
     # interpolate once:
-    assert_equal [developers(:david), developers(:poor_jamis), developers(:jamis)], projects(:active_record).developers_with_finder_sql, "first interpolation"
+    assert_equal [developers(:david), developers(:jamis), developers(:poor_jamis)], projects(:active_record).developers_with_finder_sql, "first interpolation"
     # interpolate again, for a different project id
     assert_equal [developers(:david)], projects(:action_controller).developers_with_finder_sql, "second interpolation"
   end
-- 
cgit v1.2.3


From 683ff235e6b81d28962f5a71ff53730a1c118fc8 Mon Sep 17 00:00:00 2001
From: Patrick Reagan <patrick.reagan@viget.com>
Date: Fri, 22 Aug 2008 12:48:00 +0100
Subject: Ensure t.timestamps respects options. [#828 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 activerecord/test/cases/migration_test.rb | 37 +++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 920f719995..b3e6b29165 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -237,6 +237,39 @@ if ActiveRecord::Base.connection.supports_migrations?
       end
     end
 
+    def test_create_table_with_timestamps_should_create_datetime_columns
+      table_name = :testings
+
+      Person.connection.create_table table_name do |t|
+        t.timestamps
+      end
+      created_columns = Person.connection.columns(table_name)
+
+      created_at_column = created_columns.detect {|c| c.name == 'created_at' }
+      updated_at_column = created_columns.detect {|c| c.name == 'updated_at' }
+
+      assert created_at_column.null
+      assert updated_at_column.null
+    ensure
+      Person.connection.drop_table table_name rescue nil
+    end
+
+    def test_create_table_with_timestamps_should_create_datetime_columns_with_options
+      table_name = :testings
+
+      Person.connection.create_table table_name do |t|
+        t.timestamps :null => false
+      end
+      created_columns = Person.connection.columns(table_name)
+
+      created_at_column = created_columns.detect {|c| c.name == 'created_at' }
+      updated_at_column = created_columns.detect {|c| c.name == 'updated_at' }
+
+      assert !created_at_column.null
+      assert !updated_at_column.null
+    ensure
+      Person.connection.drop_table table_name rescue nil
+    end
 
     # SQL Server, Sybase, and SQLite3 will not allow you to add a NOT NULL
     # column to a table without a default value.
@@ -1192,8 +1225,8 @@ if ActiveRecord::Base.connection.supports_migrations?
 
       def test_timestamps_creates_updated_at_and_created_at
         with_new_table do |t|
-          t.expects(:column).with(:created_at, :datetime)
-          t.expects(:column).with(:updated_at, :datetime)
+          t.expects(:column).with(:created_at, :datetime, kind_of(Hash))
+          t.expects(:column).with(:updated_at, :datetime, kind_of(Hash))
           t.timestamps
         end
       end
-- 
cgit v1.2.3


From 707ee0e2695e85186d59aa407f09691ebfcc3125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarmo=20T=C3=A4nav?= <tarmo@itech.ee>
Date: Fri, 22 Aug 2008 23:53:31 +0300
Subject: Made migrations transactional for PostgreSQL [#834 state:resolved]

Patch originally from http://dev.rubyonrails.org/ticket/5470
---
 activerecord/test/cases/migration_test.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index b3e6b29165..9639588ef2 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -937,6 +937,21 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert_equal(0, ActiveRecord::Migrator.current_version)
     end
 
+    if current_adapter?(:PostgreSQLAdapter)
+      def test_migrator_one_up_with_exception_and_rollback
+        assert !Person.column_methods_hash.include?(:last_name)
+
+        e = assert_raises(StandardError) do
+          ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/broken", 100)
+        end
+
+        assert_equal "An error has occurred, this and all later migrations canceled:\n\nSomething broke", e.message
+
+        Person.reset_column_information
+        assert !Person.column_methods_hash.include?(:last_name)
+      end
+    end
+
     def test_finds_migrations
       migrations = ActiveRecord::Migrator.new(:up, MIGRATIONS_ROOT + "/valid").migrations
       [['1', 'people_have_last_names'],
-- 
cgit v1.2.3


From e48e77e0222292176cd9f68658dd54524f582d9b Mon Sep 17 00:00:00 2001
From: Josh Susser <josh@hasmanythrough.com>
Date: Mon, 18 Aug 2008 15:56:37 -0700
Subject: coerce blank strings to nil values for boolean and integer fields

[#860 state:resolved]
---
 activerecord/test/cases/base_test.rb        | 10 +++++++++-
 activerecord/test/cases/validations_test.rb |  8 ++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 36d30ade5e..730d2a89bd 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -138,7 +138,7 @@ class BasicsTest < ActiveRecord::TestCase
   if current_adapter?(:MysqlAdapter)
     def test_read_attributes_before_type_cast_on_boolean
       bool = Booleantest.create({ "value" => false })
-      assert_equal 0, bool.attributes_before_type_cast["value"]
+      assert_equal "0", bool.reload.attributes_before_type_cast["value"]
     end
   end
 
@@ -1114,11 +1114,15 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_boolean
+    b_nil = Booleantest.create({ "value" => nil })
+    nil_id = b_nil.id
     b_false = Booleantest.create({ "value" => false })
     false_id = b_false.id
     b_true = Booleantest.create({ "value" => true })
     true_id = b_true.id
 
+    b_nil = Booleantest.find(nil_id)
+    assert_nil b_nil.value
     b_false = Booleantest.find(false_id)
     assert !b_false.value?
     b_true = Booleantest.find(true_id)
@@ -1126,11 +1130,15 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_boolean_cast_from_string
+    b_blank = Booleantest.create({ "value" => "" })
+    blank_id = b_blank.id
     b_false = Booleantest.create({ "value" => "0" })
     false_id = b_false.id
     b_true = Booleantest.create({ "value" => "1" })
     true_id = b_true.id
 
+    b_blank = Booleantest.find(blank_id)
+    assert_nil b_blank.value
     b_false = Booleantest.find(false_id)
     assert !b_false.value?
     b_true = Booleantest.find(true_id)
diff --git a/activerecord/test/cases/validations_test.rb b/activerecord/test/cases/validations_test.rb
index 4b2d28c80b..a40bda2533 100644
--- a/activerecord/test/cases/validations_test.rb
+++ b/activerecord/test/cases/validations_test.rb
@@ -1420,8 +1420,8 @@ class ValidatesNumericalityTest < ActiveRecord::TestCase
   def test_validates_numericality_of_with_nil_allowed
     Topic.validates_numericality_of :approved, :allow_nil => true
 
-    invalid!(BLANK + JUNK)
-    valid!(NIL + FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
+    invalid!(JUNK)
+    valid!(NIL + BLANK + FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
   end
 
   def test_validates_numericality_of_with_integer_only
@@ -1434,8 +1434,8 @@ class ValidatesNumericalityTest < ActiveRecord::TestCase
   def test_validates_numericality_of_with_integer_only_and_nil_allowed
     Topic.validates_numericality_of :approved, :only_integer => true, :allow_nil => true
 
-    invalid!(BLANK + JUNK + FLOATS + BIGDECIMAL + INFINITY)
-    valid!(NIL + INTEGERS)
+    invalid!(JUNK + FLOATS + BIGDECIMAL + INFINITY)
+    valid!(NIL + BLANK + INTEGERS)
   end
 
   def test_validates_numericality_with_greater_than
-- 
cgit v1.2.3


From 74c3c701f73407a5bb1a11be2b5b221fe39895d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarmo=20T=C3=A4nav?= <tarmo@itech.ee>
Date: Sat, 23 Aug 2008 19:51:09 +0300
Subject: Don't set "NULL" as a constraint on nullable columns [#398
 state:resolved]

This is already the default and adding it breaks SQL standards compatibility.
---
 activerecord/test/cases/column_definition_test.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/column_definition_test.rb b/activerecord/test/cases/column_definition_test.rb
index 540f42f4b6..98abc8eac8 100644
--- a/activerecord/test/cases/column_definition_test.rb
+++ b/activerecord/test/cases/column_definition_test.rb
@@ -9,13 +9,13 @@ class ColumnDefinitionTest < ActiveRecord::TestCase
   end
 
   # Avoid column definitions in create table statements like:
-  # `title` varchar(255) DEFAULT NULL NULL
+  # `title` varchar(255) DEFAULT NULL
   def test_should_not_include_default_clause_when_default_is_null
     column = ActiveRecord::ConnectionAdapters::Column.new("title", nil, "varchar(20)")
     column_def = ActiveRecord::ConnectionAdapters::ColumnDefinition.new(
       @adapter, column.name, "string",
       column.limit, column.precision, column.scale, column.default, column.null)
-    assert_equal "title varchar(20) NULL", column_def.to_sql
+    assert_equal "title varchar(20)", column_def.to_sql
   end
 
   def test_should_include_default_clause_when_default_is_present
@@ -23,7 +23,7 @@ class ColumnDefinitionTest < ActiveRecord::TestCase
     column_def = ActiveRecord::ConnectionAdapters::ColumnDefinition.new(
       @adapter, column.name, "string",
       column.limit, column.precision, column.scale, column.default, column.null)
-    assert_equal %Q{title varchar(20) DEFAULT 'Hello' NULL}, column_def.to_sql
+    assert_equal %Q{title varchar(20) DEFAULT 'Hello'}, column_def.to_sql
   end
 
   def test_should_specify_not_null_if_null_option_is_false
@@ -33,4 +33,4 @@ class ColumnDefinitionTest < ActiveRecord::TestCase
       column.limit, column.precision, column.scale, column.default, column.null)
     assert_equal %Q{title varchar(20) DEFAULT 'Hello' NOT NULL}, column_def.to_sql
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From e02f0dcc24f871d8429229db4219ee1e93636496 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sun, 24 Aug 2008 02:51:45 +0200
Subject: Rollback the transaction when a before_* callback returns false.

Previously this would have committed the transaction but not carried out save or destroy operation.

[#891 state:committed]
Signed-off-by: Michael Koziarski <michael@koziarski.com>
---
 activerecord/test/cases/transactions_test.rb | 62 +++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index 06a76eacc3..af3ee6ddba 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -2,6 +2,7 @@ require "cases/helper"
 require 'models/topic'
 require 'models/reply'
 require 'models/developer'
+require 'models/book'
 
 class TransactionTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
@@ -86,8 +87,7 @@ class TransactionTest < ActiveRecord::TestCase
     assert Topic.find(2).approved?, "Second should still be approved"
   end
 
-
-  def test_callback_rollback_in_save
+  def test_raising_exception_in_callback_rollbacks_in_save
     add_exception_raising_after_save_callback_to_topic
 
     begin
@@ -102,6 +102,54 @@ class TransactionTest < ActiveRecord::TestCase
     end
   end
 
+  def test_cancellation_from_before_destroy_rollbacks_in_destroy
+    add_cancelling_before_destroy_with_db_side_effect_to_topic
+    begin
+      nbooks_before_destroy = Book.count
+      status = @first.destroy
+      assert !status
+      assert_nothing_raised(ActiveRecord::RecordNotFound) { @first.reload }
+      assert_equal nbooks_before_destroy, Book.count
+    ensure
+      remove_cancelling_before_destroy_with_db_side_effect_to_topic
+    end
+  end
+
+  def test_cancellation_from_before_filters_rollbacks_in_save
+    %w(validation save).each do |filter|
+      send("add_cancelling_before_#{filter}_with_db_side_effect_to_topic")
+      begin
+        nbooks_before_save = Book.count
+        original_author_name = @first.author_name
+        @first.author_name += '_this_should_not_end_up_in_the_db'
+        status = @first.save
+        assert !status
+        assert_equal original_author_name, @first.reload.author_name
+        assert_equal nbooks_before_save, Book.count
+      ensure
+        send("remove_cancelling_before_#{filter}_with_db_side_effect_to_topic")
+      end
+    end
+  end
+
+  def test_cancellation_from_before_filters_rollbacks_in_save!
+    %w(validation save).each do |filter|
+      send("add_cancelling_before_#{filter}_with_db_side_effect_to_topic")
+      begin
+        nbooks_before_save = Book.count
+        original_author_name = @first.author_name
+        @first.author_name += '_this_should_not_end_up_in_the_db'
+        @first.save!
+        flunk
+      rescue => e
+        assert_equal original_author_name, @first.reload.author_name
+        assert_equal nbooks_before_save, Book.count
+      ensure
+        send("remove_cancelling_before_#{filter}_with_db_side_effect_to_topic")
+      end
+    end
+  end
+
   def test_callback_rollback_in_create
     new_topic = Topic.new(
       :title => "A new topic",
@@ -221,6 +269,16 @@ class TransactionTest < ActiveRecord::TestCase
     def remove_exception_raising_after_create_callback_to_topic
       Topic.class_eval { remove_method :after_create }
     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}() Book.create; false end"
+      end
+
+      define_method("remove_cancelling_before_#{filter}_with_db_side_effect_to_topic") do
+        Topic.class_eval "remove_method :before_#{filter}"
+      end
+    end
 end
 
 if current_adapter?(:PostgreSQLAdapter)
-- 
cgit v1.2.3


From 950ea332425ca862f4f38d01ddb2db7073b744c1 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sun, 24 Aug 2008 11:08:49 -0700
Subject: Fix test to assign the module instead of a new instance

---
 activerecord/test/cases/i18n_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/i18n_test.rb b/activerecord/test/cases/i18n_test.rb
index 06036733f5..9f934ab569 100644
--- a/activerecord/test/cases/i18n_test.rb
+++ b/activerecord/test/cases/i18n_test.rb
@@ -40,7 +40,7 @@ class ActiveRecordI18nTests < Test::Unit::TestCase
 
   private
     def reset_translations
-      I18n.backend = I18n::Backend::Simple.new
+      I18n.backend = I18n::Backend::Simple
     end
 end
 
-- 
cgit v1.2.3


From 49859b0bb1dc41dca33331f198eaf2ccf034a6b4 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Mon, 25 Aug 2008 11:48:03 +0200
Subject: I18n: fix activerecord i18n test for classy backend

---
 activerecord/test/cases/i18n_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/i18n_test.rb b/activerecord/test/cases/i18n_test.rb
index 9f934ab569..06036733f5 100644
--- a/activerecord/test/cases/i18n_test.rb
+++ b/activerecord/test/cases/i18n_test.rb
@@ -40,7 +40,7 @@ class ActiveRecordI18nTests < Test::Unit::TestCase
 
   private
     def reset_translations
-      I18n.backend = I18n::Backend::Simple
+      I18n.backend = I18n::Backend::Simple.new
     end
 end
 
-- 
cgit v1.2.3


From 1c54ca4f75f9c761ee0f721c38cc4f315ac5ee01 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 25 Aug 2008 18:16:21 -0700
Subject: Ruby 1.9 compat: fix test error masked by old String#each behavior

---
 activerecord/test/cases/validations_i18n_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index 881f219112..c353cbb078 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -133,7 +133,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     end
   
     def test_errors_full_messages_translates_human_attribute_name_for_model_attributes
-      @topic.errors.instance_variable_set :@errors, { 'title' => 'empty' }
+      @topic.errors.instance_variable_set :@errors, { 'title' => ['empty'] }
       I18n.expects(:translate).with(:"topic.title", :default => ['Title'], :scope => [:activerecord, :attributes], :count => 1).returns('Title')
       @topic.errors.full_messages :locale => 'en-US'
     end
-- 
cgit v1.2.3


From e5cad349164ae512c45376e00578855b780d7a48 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 25 Aug 2008 18:16:58 -0700
Subject: strip trailing whitespace

---
 activerecord/test/cases/validations_i18n_test.rb | 314 +++++++++++------------
 1 file changed, 157 insertions(+), 157 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index c353cbb078..43592bcee3 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -8,16 +8,16 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     @topic = Topic.new
     I18n.backend.store_translations('en-US', :activerecord => {:errors => {:messages => {:custom => nil}}})
   end
-  
+
   def teardown
     reset_callbacks Topic
     I18n.load_translations File.dirname(__FILE__) + '/../../lib/active_record/locale/en-US.yml'
   end
-  
+
   def unique_topic
     @unique ||= Topic.create :title => 'unique!'
   end
-  
+
   def replied_topic
     @replied_topic ||= begin
       topic = Topic.create(:title => "topic")
@@ -25,7 +25,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       topic
     end
   end
-  
+
   def reset_callbacks(*models)
     models.each do |model|
       model.instance_variable_set("@validate_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
@@ -33,43 +33,43 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       model.instance_variable_set("@validate_on_update_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
     end
   end
-  
+
   def test_default_error_messages_is_deprecated
     assert_deprecated('ActiveRecord::Errors.default_error_messages') do
       ActiveRecord::Errors.default_error_messages
     end
   end
-  
+
   # ActiveRecord::Errors
   uses_mocha 'ActiveRecord::Errors' do
 
     def test_errors_generate_message_translates_custom_model_attribute_key
 
       I18n.expects(:translate).with(
-        :topic, 
-        { :count => 1, 
-          :default => ['Topic'], 
+        :topic,
+        { :count => 1,
+          :default => ['Topic'],
           :scope => [:activerecord, :models]
         }
       ).returns('Topic')
 
       I18n.expects(:translate).with(
-        :"topic.title", 
-        { :count => 1, 
-          :default => ['Title'], 
+        :"topic.title",
+        { :count => 1,
+          :default => ['Title'],
           :scope => [:activerecord, :attributes]
         }
       ).returns('Title')
 
       I18n.expects(:translate).with(
-        :"models.topic.attributes.title.invalid", 
-        :value => nil, 
-        :scope => [:activerecord, :errors], 
+        :"models.topic.attributes.title.invalid",
+        :value => nil,
+        :scope => [:activerecord, :errors],
         :default => [
-          :"models.topic.invalid", 
-          'default from class def error 1', 
-          :"messages.invalid"], 
-        :attribute => "Title", 
+          :"models.topic.invalid",
+          'default from class def error 1',
+          :"messages.invalid"],
+        :attribute => "Title",
         :model => "Topic"
       ).returns('default from class def error 1')
 
@@ -79,66 +79,66 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     def test_errors_generate_message_translates_custom_model_attribute_keys_with_sti
 
       I18n.expects(:translate).with(
-        :reply, 
-        { :count => 1, 
-          :default => [:topic, 'Reply'], 
+        :reply,
+        { :count => 1,
+          :default => [:topic, 'Reply'],
           :scope => [:activerecord, :models]
         }
       ).returns('Reply')
 
       I18n.expects(:translate).with(
-        :"reply.title", 
-        { :count => 1, 
-          :default => [:'topic.title', 'Title'], 
+        :"reply.title",
+        { :count => 1,
+          :default => [:'topic.title', 'Title'],
           :scope => [:activerecord, :attributes]
         }
       ).returns('Title')
-      
+
       I18n.expects(:translate).with(
-        :"models.reply.attributes.title.invalid", 
-        :value => nil, 
-        :scope => [:activerecord, :errors], 
+        :"models.reply.attributes.title.invalid",
+        :value => nil,
+        :scope => [:activerecord, :errors],
         :default => [
-          :"models.reply.invalid", 
-          :"models.topic.attributes.title.invalid", 
-          :"models.topic.invalid", 
-          'default from class def', 
-          :"messages.invalid"], 
-        :model => 'Reply', 
+          :"models.reply.invalid",
+          :"models.topic.attributes.title.invalid",
+          :"models.topic.invalid",
+          'default from class def',
+          :"messages.invalid"],
+        :model => 'Reply',
         :attribute => 'Title'
       ).returns("default from class def")
-      
+
       Reply.new.errors.generate_message :title, :invalid, :default => 'default from class def'
-    
+
     end
 
     def test_errors_add_on_empty_generates_message
       @topic.errors.expects(:generate_message).with(:title, :empty, {:default => nil})
       @topic.errors.add_on_empty :title
     end
-  
+
     def test_errors_add_on_empty_generates_message_with_custom_default_message
       @topic.errors.expects(:generate_message).with(:title, :empty, {:default => 'custom'})
       @topic.errors.add_on_empty :title, 'custom'
     end
-  
+
     def test_errors_add_on_blank_generates_message
       @topic.errors.expects(:generate_message).with(:title, :blank, {:default => nil})
       @topic.errors.add_on_blank :title
     end
-  
+
     def test_errors_add_on_blank_generates_message_with_custom_default_message
       @topic.errors.expects(:generate_message).with(:title, :blank, {:default => 'custom'})
       @topic.errors.add_on_blank :title, 'custom'
     end
-  
+
     def test_errors_full_messages_translates_human_attribute_name_for_model_attributes
       @topic.errors.instance_variable_set :@errors, { 'title' => ['empty'] }
       I18n.expects(:translate).with(:"topic.title", :default => ['Title'], :scope => [:activerecord, :attributes], :count => 1).returns('Title')
       @topic.errors.full_messages :locale => 'en-US'
     end
-  end  
-  
+  end
+
   # ActiveRecord::Validations
   uses_mocha 'ActiveRecord::Validations' do
     # validates_confirmation_of w/ mocha
@@ -156,7 +156,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       @topic.errors.expects(:generate_message).with(:title, :confirmation, {:default => 'custom'})
       @topic.valid?
     end
-    
+
     # validates_acceptance_of w/ mocha
 
     def test_validates_acceptance_of_generates_message
@@ -170,9 +170,9 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       @topic.errors.expects(:generate_message).with(:title, :accepted, {:default => 'custom'})
       @topic.valid?
     end
-    
+
     # validates_presence_of w/ mocha
-    
+
     def test_validates_presence_of_generates_message
       Topic.validates_presence_of :title
       @topic.errors.expects(:generate_message).with(:title, :blank, {:default => nil})
@@ -184,7 +184,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       @topic.errors.expects(:generate_message).with(:title, :blank, {:default => 'custom'})
       @topic.valid?
     end
-    
+
     def test_validates_length_of_within_generates_message_with_title_too_short
       Topic.validates_length_of :title, :within => 3..5
       @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => nil})
@@ -238,7 +238,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => 'custom'})
       @topic.valid?
     end
-    
+
     # validates_length_of :is w/ mocha
 
     def test_validates_length_of_is_generates_message
@@ -252,7 +252,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       @topic.errors.expects(:generate_message).with(:title, :wrong_length, {:count => 5, :default => 'custom'})
       @topic.valid?
     end
-    
+
     # validates_uniqueness_of w/ mocha
 
     def test_validates_uniqueness_of_generates_message
@@ -268,7 +268,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       @topic.errors.expects(:generate_message).with(:title, :taken, {:default => 'custom', :value => 'unique!'})
       @topic.valid?
     end
-    
+
     # validates_format_of w/ mocha
 
     def test_validates_format_of_generates_message
@@ -284,7 +284,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       @topic.errors.expects(:generate_message).with(:title, :invalid, {:value => '72x', :default => 'custom'})
       @topic.valid?
     end
-    
+
     # validates_inclusion_of w/ mocha
 
     def test_validates_inclusion_of_generates_message
@@ -300,7 +300,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       @topic.errors.expects(:generate_message).with(:title, :inclusion, {:value => 'z', :default => 'custom'})
       @topic.valid?
     end
-    
+
     # validates_exclusion_of w/ mocha
 
     def test_validates_exclusion_of_generates_message
@@ -316,7 +316,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       @topic.errors.expects(:generate_message).with(:title, :exclusion, {:value => 'a', :default => 'custom'})
       @topic.valid?
     end
-    
+
     # validates_numericality_of without :only_integer w/ mocha
 
     def test_validates_numericality_of_generates_message
@@ -332,7 +332,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => 'custom'})
       @topic.valid?
     end
-    
+
     # validates_numericality_of with :only_integer w/ mocha
 
     def test_validates_numericality_of_only_integer_generates_message
@@ -348,7 +348,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => 'custom'})
       @topic.valid?
     end
-    
+
     # validates_numericality_of :odd w/ mocha
 
     def test_validates_numericality_of_odd_generates_message
@@ -364,7 +364,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       @topic.errors.expects(:generate_message).with(:title, :odd, {:value => 0, :default => 'custom'})
       @topic.valid?
     end
-    
+
     # validates_numericality_of :less_than w/ mocha
 
     def test_validates_numericality_of_less_than_generates_message
@@ -380,7 +380,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       @topic.errors.expects(:generate_message).with(:title, :less_than, {:value => 1, :count => 0, :default => 'custom'})
       @topic.valid?
     end
-    
+
     # validates_associated w/ mocha
 
     def test_validates_associated_generates_message
@@ -395,282 +395,282 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
       replied_topic.valid?
     end
   end
-  
+
   # validates_confirmation_of w/o mocha
-  
+
   def test_validates_confirmation_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:confirmation => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:confirmation => 'global message'}}}
-  
+
     Topic.validates_confirmation_of :title
     @topic.title_confirmation = 'foo'
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
   end
-  
+
   def test_validates_confirmation_of_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:confirmation => 'global message'}}}
-  
+
     Topic.validates_confirmation_of :title
     @topic.title_confirmation = 'foo'
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
   end
-  
+
   # validates_acceptance_of w/o mocha
-  
+
   def test_validates_acceptance_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:accepted => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:accepted => 'global message'}}}
-  
+
     Topic.validates_acceptance_of :title, :allow_nil => false
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
   end
-  
+
   def test_validates_acceptance_of_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:accepted => 'global message'}}}
-  
+
     Topic.validates_acceptance_of :title, :allow_nil => false
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
   end
-  
+
   # validates_presence_of w/o mocha
-    
+
   def test_validates_presence_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:blank => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:blank => 'global message'}}}
-  
+
     Topic.validates_presence_of :title
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
   end
-  
+
   def test_validates_presence_of_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:blank => 'global message'}}}
-  
+
     Topic.validates_presence_of :title
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
   end
-  
+
   # validates_length_of :within w/o mocha
-  
+
   def test_validates_length_of_within_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:too_short => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:too_short => 'global message'}}}
-  
+
     Topic.validates_length_of :title, :within => 3..5
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
   end
-  
+
   def test_validates_length_of_within_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:too_short => 'global message'}}}
-  
+
     Topic.validates_length_of :title, :within => 3..5
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
   end
-  
+
   # validates_length_of :is w/o mocha
-  
+
   def test_validates_length_of_within_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:wrong_length => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
-  
+
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
   end
-  
+
   def test_validates_length_of_within_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
-  
+
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
   end
-  
+
   # validates_uniqueness_of w/o mocha
-  
+
   def test_validates_length_of_within_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:wrong_length => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
-  
+
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
   end
-  
+
   def test_validates_length_of_within_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
-  
+
     Topic.validates_length_of :title, :is => 5
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
   end
-  
-  
+
+
   # validates_format_of w/o mocha
-  
+
   def test_validates_format_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:invalid => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
-  
+
     Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
   end
-  
+
   def test_validates_format_of_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
-  
+
     Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
   end
-  
+
   # validates_inclusion_of w/o mocha
-  
+
   def test_validates_inclusion_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:inclusion => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:inclusion => 'global message'}}}
-  
+
     Topic.validates_inclusion_of :title, :in => %w(a b c)
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
   end
-  
+
   def test_validates_inclusion_of_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:inclusion => 'global message'}}}
-  
+
     Topic.validates_inclusion_of :title, :in => %w(a b c)
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
   end
-  
+
   # validates_exclusion_of w/o mocha
-  
+
   def test_validates_exclusion_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:exclusion => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:exclusion => 'global message'}}}
-  
+
     Topic.validates_exclusion_of :title, :in => %w(a b c)
     @topic.title = 'a'
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
   end
-  
+
   def test_validates_exclusion_of_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:exclusion => 'global message'}}}
-  
+
     Topic.validates_exclusion_of :title, :in => %w(a b c)
     @topic.title = 'a'
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
   end
-  
+
   # validates_numericality_of without :only_integer w/o mocha
-  
+
   def test_validates_numericality_of_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:not_a_number => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:not_a_number => 'global message'}}}
-  
+
     Topic.validates_numericality_of :title
     @topic.title = 'a'
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
   end
-  
+
   def test_validates_numericality_of_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:not_a_number => 'global message'}}}
-  
+
     Topic.validates_numericality_of :title, :only_integer => true
     @topic.title = 'a'
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
   end
-  
+
   # validates_numericality_of with :only_integer w/o mocha
-  
+
   def test_validates_numericality_of_only_integer_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:not_a_number => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:not_a_number => 'global message'}}}
-  
+
     Topic.validates_numericality_of :title, :only_integer => true
     @topic.title = 'a'
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
   end
-  
+
   def test_validates_numericality_of_only_integer_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:not_a_number => 'global message'}}}
-  
+
     Topic.validates_numericality_of :title, :only_integer => true
     @topic.title = 'a'
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
   end
-  
+
   # validates_numericality_of :odd w/o mocha
-  
+
   def test_validates_numericality_of_odd_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:odd => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:odd => 'global message'}}}
-  
+
     Topic.validates_numericality_of :title, :only_integer => true, :odd => true
     @topic.title = 0
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
   end
-  
+
   def test_validates_numericality_of_odd_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:odd => 'global message'}}}
-  
+
     Topic.validates_numericality_of :title, :only_integer => true, :odd => true
     @topic.title = 0
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
   end
-  
+
   # validates_numericality_of :less_than w/o mocha
-  
+
   def test_validates_numericality_of_less_than_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:less_than => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:less_than => 'global message'}}}
-  
+
     Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
     @topic.title = 1
     @topic.valid?
     assert_equal 'custom message', @topic.errors.on(:title)
   end
-  
+
   def test_validates_numericality_of_less_than_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:less_than => 'global message'}}}
-  
+
     Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
     @topic.title = 1
     @topic.valid?
     assert_equal 'global message', @topic.errors.on(:title)
   end
-  
-  
+
+
   # validates_associated w/o mocha
-  
+
   def test_validates_associated_finds_custom_model_key_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:models => {:topic => {:attributes => {:replies => {:invalid => 'custom message'}}}}}}
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
-  
+
     Topic.validates_associated :replies
     replied_topic.valid?
     assert_equal 'custom message', replied_topic.errors.on(:replies)
   end
-  
+
   def test_validates_associated_finds_global_default_translation
     I18n.backend.store_translations 'en-US', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
-  
+
     Topic.validates_associated :replies
     replied_topic.valid?
     assert_equal 'global message', replied_topic.errors.on(:replies)
@@ -705,11 +705,11 @@ class ActiveRecordValidationsGenerateMessageI18nTests < Test::Unit::TestCase
             :odd => "must be odd",
             :even => "must be even"
           }
-        }            
+        }
       }
     }
   end
-  
+
   def reset_callbacks(*models)
     models.each do |model|
       model.instance_variable_set("@validate_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
@@ -717,115 +717,115 @@ class ActiveRecordValidationsGenerateMessageI18nTests < Test::Unit::TestCase
       model.instance_variable_set("@validate_on_update_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
     end
   end
-  
+
   # validates_inclusion_of: generate_message(attr_name, :inclusion, :default => configuration[:message], :value => value)
   def test_generate_message_inclusion_with_default_message
     assert_equal 'is not included in the list', @topic.errors.generate_message(:title, :inclusion, :default => nil, :value => 'title')
   end
-  
+
   def test_generate_message_inclusion_with_custom_message
     assert_equal 'custom message title', @topic.errors.generate_message(:title, :inclusion, :default => 'custom message {{value}}', :value => 'title')
   end
-  
+
   # validates_exclusion_of: generate_message(attr_name, :exclusion, :default => configuration[:message], :value => value)
   def test_generate_message_exclusion_with_default_message
     assert_equal 'is reserved', @topic.errors.generate_message(:title, :exclusion, :default => nil, :value => 'title')
   end
-  
+
   def test_generate_message_exclusion_with_custom_message
     assert_equal 'custom message title', @topic.errors.generate_message(:title, :exclusion, :default => 'custom message {{value}}', :value => 'title')
   end
-  
+
   # validates_associated: generate_message(attr_name, :invalid, :default => configuration[:message], :value => value)
   # validates_format_of:  generate_message(attr_name, :invalid, :default => configuration[:message], :value => value)
   def test_generate_message_invalid_with_default_message
     assert_equal 'is invalid', @topic.errors.generate_message(:title, :invalid, :default => nil, :value => 'title')
   end
-  
+
   def test_generate_message_invalid_with_custom_message
     assert_equal 'custom message title', @topic.errors.generate_message(:title, :invalid, :default => 'custom message {{value}}', :value => 'title')
   end
-  
+
   # validates_confirmation_of: generate_message(attr_name, :confirmation, :default => configuration[:message])
   def test_generate_message_confirmation_with_default_message
     assert_equal "doesn't match confirmation", @topic.errors.generate_message(:title, :confirmation, :default => nil)
   end
-  
+
   def test_generate_message_confirmation_with_custom_message
     assert_equal 'custom message', @topic.errors.generate_message(:title, :confirmation, :default => 'custom message')
   end
-  
+
   # validates_acceptance_of: generate_message(attr_name, :accepted, :default => configuration[:message])
   def test_generate_message_accepted_with_default_message
     assert_equal "must be accepted", @topic.errors.generate_message(:title, :accepted, :default => nil)
   end
-  
+
   def test_generate_message_accepted_with_custom_message
     assert_equal 'custom message', @topic.errors.generate_message(:title, :accepted, :default => 'custom message')
   end
-  
+
   # add_on_empty: generate_message(attr, :empty, :default => custom_message)
   def test_generate_message_empty_with_default_message
     assert_equal "can't be empty", @topic.errors.generate_message(:title, :empty, :default => nil)
   end
-  
+
   def test_generate_message_empty_with_custom_message
     assert_equal 'custom message', @topic.errors.generate_message(:title, :empty, :default => 'custom message')
   end
-  
+
   # add_on_blank: generate_message(attr, :blank, :default => custom_message)
   def test_generate_message_blank_with_default_message
     assert_equal "can't be blank", @topic.errors.generate_message(:title, :blank, :default => nil)
   end
-  
+
   def test_generate_message_blank_with_custom_message
     assert_equal 'custom message', @topic.errors.generate_message(:title, :blank, :default => 'custom message')
   end
-  
+
   # validates_length_of: generate_message(attr, :too_long, :default => options[:too_long], :count => option_value.end)
   def test_generate_message_too_long_with_default_message
     assert_equal "is too long (maximum is 10 characters)", @topic.errors.generate_message(:title, :too_long, :default => nil, :count => 10)
   end
-  
+
   def test_generate_message_too_long_with_custom_message
     assert_equal 'custom message 10', @topic.errors.generate_message(:title, :too_long, :default => 'custom message {{count}}', :count => 10)
   end
-  
+
   # validates_length_of: generate_message(attr, :too_short, :default => options[:too_short], :count => option_value.begin)
   def test_generate_message_too_short_with_default_message
     assert_equal "is too short (minimum is 10 characters)", @topic.errors.generate_message(:title, :too_short, :default => nil, :count => 10)
   end
-  
+
   def test_generate_message_too_short_with_custom_message
     assert_equal 'custom message 10', @topic.errors.generate_message(:title, :too_short, :default => 'custom message {{count}}', :count => 10)
-  end  
-  
+  end
+
   # validates_length_of: generate_message(attr, key, :default => custom_message, :count => option_value)
   def test_generate_message_wrong_length_with_default_message
     assert_equal "is the wrong length (should be 10 characters)", @topic.errors.generate_message(:title, :wrong_length, :default => nil, :count => 10)
   end
-  
+
   def test_generate_message_wrong_length_with_custom_message
     assert_equal 'custom message 10', @topic.errors.generate_message(:title, :wrong_length, :default => 'custom message {{count}}', :count => 10)
-  end  
+  end
 
   # validates_uniqueness_of: generate_message(attr_name, :taken, :default => configuration[:message])
   def test_generate_message_taken_with_default_message
     assert_equal "has already been taken", @topic.errors.generate_message(:title, :taken, :default => nil, :value => 'title')
   end
-  
+
   def test_generate_message_taken_with_custom_message
     assert_equal 'custom message title', @topic.errors.generate_message(:title, :taken, :default => 'custom message {{value}}', :value => 'title')
-  end  
+  end
 
   # validates_numericality_of: generate_message(attr_name, :not_a_number, :value => raw_value, :default => configuration[:message])
   def test_generate_message_not_a_number_with_default_message
     assert_equal "is not a number", @topic.errors.generate_message(:title, :not_a_number, :default => nil, :value => 'title')
   end
-  
+
   def test_generate_message_not_a_number_with_custom_message
     assert_equal 'custom message title', @topic.errors.generate_message(:title, :not_a_number, :default => 'custom message {{value}}', :value => 'title')
-  end  
+  end
 
   # validates_numericality_of: generate_message(attr_name, option, :value => raw_value, :default => configuration[:message])
   def test_generate_message_greater_than_with_default_message
-- 
cgit v1.2.3


From b7a37b742c0abd1df8ea48cc82f76385cc0c41ea Mon Sep 17 00:00:00 2001
From: Frederick Cheung <frederick.cheung@gmail.com>
Date: Mon, 25 Aug 2008 22:36:19 +0100
Subject: Fix preloading of has_one through associations

[#903 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 .../associations/has_one_through_associations_test.rb      | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/has_one_through_associations_test.rb b/activerecord/test/cases/associations/has_one_through_associations_test.rb
index 3eb66bc941..4a5d7e27c1 100644
--- a/activerecord/test/cases/associations/has_one_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_through_associations_test.rb
@@ -44,19 +44,23 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
   def test_has_one_through_polymorphic
     assert_equal clubs(:moustache_club), @member.sponsor_club
   end
-  
+
   def has_one_through_to_has_many
     assert_equal 2, @member.fellow_members.size
   end
-  
+
   def test_has_one_through_eager_loading
-    members = Member.find(:all, :include => :club, :conditions => ["name = ?", "Groucho Marx"])
+    members = assert_queries(3) do #base table, through table, clubs table
+      Member.find(:all, :include => :club, :conditions => ["name = ?", "Groucho Marx"])
+    end
     assert_equal 1, members.size
     assert_not_nil assert_no_queries {members[0].club}
   end
-  
+
   def test_has_one_through_eager_loading_through_polymorphic
-    members = Member.find(:all, :include => :sponsor_club, :conditions => ["name = ?", "Groucho Marx"])
+    members = assert_queries(3) do #base table, through table, clubs table
+      Member.find(:all, :include => :sponsor_club, :conditions => ["name = ?", "Groucho Marx"])
+    end
     assert_equal 1, members.size
     assert_not_nil assert_no_queries {members[0].sponsor_club}    
   end
-- 
cgit v1.2.3


From 2dbda11945507a0541d61d13b8c564121c1cd362 Mon Sep 17 00:00:00 2001
From: Frederick Cheung <frederick.cheung@gmail.com>
Date: Mon, 25 Aug 2008 23:20:10 +0100
Subject: Implement old-skool eagerloading for has_one :through

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 .../associations/has_one_through_associations_test.rb    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/has_one_through_associations_test.rb b/activerecord/test/cases/associations/has_one_through_associations_test.rb
index 4a5d7e27c1..ed24794444 100644
--- a/activerecord/test/cases/associations/has_one_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_through_associations_test.rb
@@ -75,4 +75,20 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
     assert_not_nil assert_no_queries {clubs[0].sponsored_member}
   end
 
+  def test_has_one_through_nonpreload_eagerloading
+    members = assert_queries(1) do
+      Member.find(:all, :include => :club, :conditions => ["members.name = ?", "Groucho Marx"], :order => 'clubs.name') #force fallback
+    end
+    assert_equal 1, members.size
+    assert_not_nil assert_no_queries {members[0].club}
+  end
+
+  def test_has_one_through_nonpreload_eager_loading_through_polymorphic
+    members = assert_queries(1) do
+      Member.find(:all, :include => :sponsor_club, :conditions => ["members.name = ?", "Groucho Marx"], :order => 'clubs.name') #force fallback
+    end
+    assert_equal 1, members.size
+    assert_not_nil assert_no_queries {members[0].sponsor_club}
+  end
+
 end
-- 
cgit v1.2.3


From a445cdd8840c4e99c40c6d5b15ab380d39a56be3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarmo=20T=C3=A4nav?= <tarmo@itech.ee>
Date: Tue, 26 Aug 2008 03:01:24 +0300
Subject: Load the first and not the last has_one result when doing join-based
 eager loading

This matters when the has_one is defined with an order in which case
there is an expectation that the first one will be loaded.

[#904 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 activerecord/test/cases/associations/eager_test.rb             |  6 ++++++
 .../cases/associations/has_one_through_associations_test.rb    | 10 ++++++++++
 2 files changed, 16 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index f37e18df35..956a2891aa 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -38,6 +38,12 @@ class EagerAssociationTest < ActiveRecord::TestCase
     assert_equal Post.find(1).last_comment, post.last_comment
   end
 
+  def test_loading_with_one_association_with_non_preload
+    posts = Post.find(:all, :include => :last_comment, :order => 'comments.id DESC')
+    post = posts.find { |p| p.id == 1 }
+    assert_equal Post.find(1).last_comment, post.last_comment
+  end
+
   def test_loading_conditions_with_or
     posts = authors(:david).posts.find(:all, :include => :comments, :conditions => "comments.body like 'Normal%' OR comments.#{QUOTED_TYPE} = 'SpecialComment'")
     assert_nil posts.detect { |p| p.author_id != authors(:david).id },
diff --git a/activerecord/test/cases/associations/has_one_through_associations_test.rb b/activerecord/test/cases/associations/has_one_through_associations_test.rb
index ed24794444..b61a3711e3 100644
--- a/activerecord/test/cases/associations/has_one_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_through_associations_test.rb
@@ -91,4 +91,14 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
     assert_not_nil assert_no_queries {members[0].sponsor_club}
   end
 
+  def test_has_one_through_nonpreload_eager_loading_through_polymorphic_with_more_than_one_through_record
+    Sponsor.new(:sponsor_club => clubs(:crazy_club), :sponsorable => members(:groucho)).save!
+    members = assert_queries(1) do
+      Member.find(:all, :include => :sponsor_club, :conditions => ["members.name = ?", "Groucho Marx"], :order => 'clubs.name DESC') #force fallback
+    end
+    assert_equal 1, members.size
+    assert_not_nil assert_no_queries { members[0].sponsor_club }
+    assert_equal clubs(:crazy_club), members[0].sponsor_club
+  end
+
 end
-- 
cgit v1.2.3


From 3beed9cdb7cf2cf75fb043b72ca99cc23fc11556 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 25 Aug 2008 23:32:03 -0700
Subject: ensure tests load sibling Active Support instead of a gem

---
 activerecord/test/cases/helper.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index 0530ba9bd9..f30d58546e 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -1,4 +1,5 @@
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
+$:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
 
 require 'config'
 require 'test/unit'
-- 
cgit v1.2.3


From 143f5fbb21b6dfcaab63d67b44afd922dab9dcf5 Mon Sep 17 00:00:00 2001
From: Josh Susser <josh@hasmanythrough.com>
Date: Mon, 25 Aug 2008 19:32:19 -0700
Subject: refactor dynamic finder name matching into its own class

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 activerecord/test/cases/finder_test.rb | 42 ++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index b97db73b68..875d56f6c1 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -12,6 +12,48 @@ require 'models/customer'
 require 'models/job'
 require 'models/categorization'
 
+class DynamicFinderMatchTest < ActiveRecord::TestCase
+  def test_find_no_match
+    assert_nil ActiveRecord::DynamicFinderMatch.match("not_a_finder")
+  end
+
+  def test_find_by
+    match = ActiveRecord::DynamicFinderMatch.match("find_by_age_and_sex_and_location")
+    assert_not_nil match
+    assert match.finder?
+    assert_equal :find_initial, match.finder
+    assert_equal %w(age sex location), match.attribute_names
+  end
+
+  def test_find_all_by
+    match = ActiveRecord::DynamicFinderMatch.match("find_all_by_age_and_sex_and_location")
+    assert_not_nil match
+    assert match.finder?
+    assert_equal :find_every, match.finder
+    assert_equal %w(age sex location), match.attribute_names
+  end
+
+  def test_find_or_initialize_by
+    match = ActiveRecord::DynamicFinderMatch.match("find_or_initialize_by_age_and_sex_and_location")
+    assert_not_nil match
+    assert !match.finder?
+    assert match.instantiator?
+    assert_equal :find_initial, match.finder
+    assert_equal :new, match.instantiator
+    assert_equal %w(age sex location), match.attribute_names
+  end
+
+  def test_find_or_create_by
+    match = ActiveRecord::DynamicFinderMatch.match("find_or_create_by_age_and_sex_and_location")
+    assert_not_nil match
+    assert !match.finder?
+    assert match.instantiator?
+    assert_equal :find_initial, match.finder
+    assert_equal :create, match.instantiator
+    assert_equal %w(age sex location), match.attribute_names
+  end
+end
+
 class FinderTest < ActiveRecord::TestCase
   fixtures :companies, :topics, :entrants, :developers, :developers_projects, :posts, :comments, :accounts, :authors, :customers
 
-- 
cgit v1.2.3


From 1092c181b5568d06e84f6a3253aaca81c02a2b2c Mon Sep 17 00:00:00 2001
From: Josh Susser <josh@hasmanythrough.com>
Date: Mon, 25 Aug 2008 21:28:53 -0700
Subject: add dynamic finder bang version to raise RecordNotFound

[#905 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 activerecord/test/cases/finder_test.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 875d56f6c1..2ce49ed76f 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -25,6 +25,15 @@ class DynamicFinderMatchTest < ActiveRecord::TestCase
     assert_equal %w(age sex location), match.attribute_names
   end
 
+  def find_by_bang
+    match = ActiveRecord::DynamicFinderMatch.match("find_by_age_and_sex_and_location!")
+    assert_not_nil match
+    assert match.finder?
+    assert match.bang?
+    assert_equal :find_initial, match.finder
+    assert_equal %w(age sex location), match.attribute_names
+  end
+
   def test_find_all_by
     match = ActiveRecord::DynamicFinderMatch.match("find_all_by_age_and_sex_and_location")
     assert_not_nil match
@@ -482,6 +491,11 @@ class FinderTest < ActiveRecord::TestCase
     assert_nil Topic.find_by_title("The First Topic!")
   end
 
+  def test_find_by_one_attribute_bang
+    assert_equal topics(:first), Topic.find_by_title!("The First Topic")
+    assert_raises(ActiveRecord::RecordNotFound) { Topic.find_by_title!("The First Topic!") }
+  end
+
   def test_find_by_one_attribute_caches_dynamic_finder
     # ensure this test can run independently of order
     class << Topic; self; end.send(:remove_method, :find_by_title) if Topic.public_methods.any? { |m| m.to_s == 'find_by_title' }
-- 
cgit v1.2.3


From ca48da6300ff0b49ae4125dc582f3c4666481005 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 25 Aug 2008 23:53:31 -0700
Subject: fix tests relying on implicit ordering

---
 .../cases/associations/has_and_belongs_to_many_associations_test.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
index 432d245b5b..917c241346 100644
--- a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
@@ -647,8 +647,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     developer.save
     developer.reload
     assert_equal 2, developer.projects.length
-    assert_equal projects(:active_record), developer.projects[0]
-    assert_equal projects(:action_controller), developer.projects[1]
+    assert_equal [projects(:active_record), projects(:action_controller)].map(&:id).sort, developer.projects_ids
   end
 
   def test_assign_ids_ignoring_blanks
@@ -657,8 +656,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     developer.save
     developer.reload
     assert_equal 2, developer.projects.length
-    assert_equal projects(:active_record), developer.projects[0]
-    assert_equal projects(:action_controller), developer.projects[1]
+    assert_equal [projects(:active_record), projects(:action_controller)].map(&:id).sort, developer.projects_ids
   end
 
   def test_select_limited_ids_list
-- 
cgit v1.2.3


From 842d55cb16eac7e48660ecd4df5ec1daf946f4d1 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Tue, 26 Aug 2008 00:02:22 -0700
Subject: fix another ordering failure

---
 activerecord/test/cases/base_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 730d2a89bd..c8111358e3 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -616,7 +616,7 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_update_counter
-    category = Category.first
+    category = categories(:general)
     assert_nil category.categorizations_count
     assert_equal 2, category.categorizations.count
 
-- 
cgit v1.2.3


From 6d66ddaa34ec011a4a20ca5d3f7f695b1a843734 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Tue, 26 Aug 2008 00:02:30 -0700
Subject: typo

---
 .../cases/associations/has_and_belongs_to_many_associations_test.rb   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
index 917c241346..cae9fdb090 100644
--- a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
@@ -647,7 +647,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     developer.save
     developer.reload
     assert_equal 2, developer.projects.length
-    assert_equal [projects(:active_record), projects(:action_controller)].map(&:id).sort, developer.projects_ids
+    assert_equal [projects(:active_record), projects(:action_controller)].map(&:id).sort, developer.project_ids
   end
 
   def test_assign_ids_ignoring_blanks
@@ -656,7 +656,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     developer.save
     developer.reload
     assert_equal 2, developer.projects.length
-    assert_equal [projects(:active_record), projects(:action_controller)].map(&:id).sort, developer.projects_ids
+    assert_equal [projects(:active_record), projects(:action_controller)].map(&:id).sort, developer.project_ids
   end
 
   def test_select_limited_ids_list
-- 
cgit v1.2.3


From 52e15abbedab9ef6f3db03ef39fe5cbab9c3ddde Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Tue, 26 Aug 2008 00:10:16 -0700
Subject: um.. yeah

---
 .../cases/associations/has_and_belongs_to_many_associations_test.rb   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
index cae9fdb090..0572418e3b 100644
--- a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
@@ -647,7 +647,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     developer.save
     developer.reload
     assert_equal 2, developer.projects.length
-    assert_equal [projects(:active_record), projects(:action_controller)].map(&:id).sort, developer.project_ids
+    assert_equal [projects(:active_record), projects(:action_controller)].map(&:id).sort, developer.project_ids.sort
   end
 
   def test_assign_ids_ignoring_blanks
@@ -656,7 +656,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     developer.save
     developer.reload
     assert_equal 2, developer.projects.length
-    assert_equal [projects(:active_record), projects(:action_controller)].map(&:id).sort, developer.project_ids
+    assert_equal [projects(:active_record), projects(:action_controller)].map(&:id).sort, developer.project_ids.sort
   end
 
   def test_select_limited_ids_list
-- 
cgit v1.2.3


From fa795ccfade59c4bbab91ada3bb34e5fbfac448c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarmo=20T=C3=A4nav?= <tarmo@itech.ee>
Date: Tue, 26 Aug 2008 10:48:46 +0300
Subject: Include mysql older than 5.1.23 in the 5.1 series in the list of
 those that can't handle NULL defaults

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 activerecord/test/cases/defaults_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/defaults_test.rb b/activerecord/test/cases/defaults_test.rb
index 2ea85417da..3473b846a0 100644
--- a/activerecord/test/cases/defaults_test.rb
+++ b/activerecord/test/cases/defaults_test.rb
@@ -5,7 +5,7 @@ require 'models/entrant'
 class DefaultTest < ActiveRecord::TestCase
   def test_nil_defaults_for_not_null_columns
     column_defaults =
-      if current_adapter?(:MysqlAdapter) && Mysql.client_version < 50051
+      if current_adapter?(:MysqlAdapter) && (Mysql.client_version < 50051 || (50100..50122).include?(Mysql.client_version))
         { 'id' => nil, 'name' => '',  'course_id' => nil }
       else
         { 'id' => nil, 'name' => nil, 'course_id' => nil }
-- 
cgit v1.2.3


From 0c7bbc72fc043ad5debbff34da81f3d68f516d3f Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Tue, 26 Aug 2008 02:17:36 -0700
Subject: fix tests relying on implicit ordering

---
 activerecord/test/cases/query_cache_test.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb
index eae2104531..171d0e6dae 100644
--- a/activerecord/test/cases/query_cache_test.rb
+++ b/activerecord/test/cases/query_cache_test.rb
@@ -116,8 +116,9 @@ class QueryCacheExpiryTest < ActiveRecord::TestCase
   def test_cache_is_expired_by_habtm_delete
     ActiveRecord::Base.connection.expects(:clear_query_cache).times(2)
     ActiveRecord::Base.cache do
-      c = Category.find(:first)
-      p = Post.find(:first)
+      c = Category.find(1)
+      p = Post.find(1)
+      assert p.categories.any?
       p.categories.delete_all
     end
   end
-- 
cgit v1.2.3


From ab1e82b8f7279301e4363decdef84719f9304443 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Tue, 26 Aug 2008 02:38:48 -0700
Subject: Include people and readers fixtures to fix test isolation error

---
 activerecord/test/cases/associations_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations_test.rb b/activerecord/test/cases/associations_test.rb
index 4904feeb7d..0b2731ecd7 100644
--- a/activerecord/test/cases/associations_test.rb
+++ b/activerecord/test/cases/associations_test.rb
@@ -27,7 +27,7 @@ require 'models/sponsor'
 
 class AssociationsTest < ActiveRecord::TestCase
   fixtures :accounts, :companies, :developers, :projects, :developers_projects,
-           :computers
+           :computers, :people, :readers
 
   def test_include_with_order_works
     assert_nothing_raised {Account.find(:first, :order => 'id', :include => :firm)}
@@ -45,7 +45,7 @@ class AssociationsTest < ActiveRecord::TestCase
     assert_equal [], person.readers.find(:all)
     person.save!
     reader = Reader.create! :person => person, :post => Post.new(:title => "foo", :body => "bar")
-    assert_equal [reader], person.readers.find(:all)
+    assert person.readers.find(reader.id)
   end
 
   def test_force_reload
-- 
cgit v1.2.3


From ce3c76de7c0deda08a5ed0e064b8d37c26b60cfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarmo=20T=C3=A4nav?= <tarmo@itech.ee>
Date: Tue, 26 Aug 2008 13:06:49 +0300
Subject: Just look at sql_type when testing that the correct database-specific
 type was used

Signed-off-by: Michael Koziarski <michael@koziarski.com>
---
 activerecord/test/cases/migration_test.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 9639588ef2..c1a8da2270 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -442,10 +442,7 @@ if ActiveRecord::Base.connection.supports_migrations?
 
         ActiveRecord::Migration.add_column :people, :intelligence_quotient, :tinyint
         Person.reset_column_information
-        Person.create :intelligence_quotient => 300
-        jonnyg = Person.find(:first)
-        assert_equal 127, jonnyg.intelligence_quotient
-        jonnyg.destroy
+        assert_match /tinyint/, Person.columns_hash['intelligence_quotient'].sql_type
       ensure
         ActiveRecord::Migration.remove_column :people, :intelligence_quotient rescue nil
       end
-- 
cgit v1.2.3


From eec5eb2e444b2b42206e2d5ccfe7f30306c308cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarmo=20T=C3=A4nav?= <tarmo@itech.ee>
Date: Tue, 26 Aug 2008 14:15:44 +0300
Subject: Fix yet another implicit order dependant test

Signed-off-by: Michael Koziarski <michael@koziarski.com>
---
 activerecord/test/cases/associations/eager_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 956a2891aa..e78624a98d 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -260,9 +260,9 @@ class EagerAssociationTest < ActiveRecord::TestCase
   end
 
   def test_eager_with_has_many_through
-    posts_with_comments = people(:michael).posts.find(:all, :include => :comments)
-    posts_with_author = people(:michael).posts.find(:all, :include => :author )
-    posts_with_comments_and_author = people(:michael).posts.find(:all, :include => [ :comments, :author ])
+    posts_with_comments = people(:michael).posts.find(:all, :include => :comments, :order => 'posts.id')
+    posts_with_author = people(:michael).posts.find(:all, :include => :author, :order => 'posts.id')
+    posts_with_comments_and_author = people(:michael).posts.find(:all, :include => [ :comments, :author ], :order => 'posts.id')
     assert_equal 2, posts_with_comments.inject(0) { |sum, post| sum += post.comments.size }
     assert_equal authors(:david), assert_no_queries { posts_with_author.first.author }
     assert_equal authors(:david), assert_no_queries { posts_with_comments_and_author.first.author }
-- 
cgit v1.2.3