activerecord 2.2.3 → 2.3.2

data/test/cases/query_cache_test.rb

@@ -55,8 +55,6 @@ class QueryCacheTest < ActiveRecord::TestCase
   end
 end
 
-uses_mocha 'QueryCacheExpiryTest' do
-
 class QueryCacheExpiryTest < ActiveRecord::TestCase
   fixtures :tasks, :posts, :categories, :categories_posts
 
@@ -123,5 +121,3 @@ class QueryCacheExpiryTest < ActiveRecord::TestCase
     end
   end
 end
-
-end

data/test/cases/reflection_test.rb

@@ -4,6 +4,7 @@ require 'models/customer'
 require 'models/company'
 require 'models/company_in_module'
 require 'models/subscriber'
+require 'models/pirate'
 
 class ReflectionTest < ActiveRecord::TestCase
   fixtures :topics, :customers, :companies, :subscribers
@@ -91,6 +92,15 @@ class ReflectionTest < ActiveRecord::TestCase
     assert_equal Money, Customer.reflect_on_aggregation(:balance).klass
   end
 
+  def test_reflect_on_all_autosave_associations
+    expected = Pirate.reflect_on_all_associations.select { |r| r.options[:autosave] }
+    received = Pirate.reflect_on_all_autosave_associations
+
+    assert !received.empty?
+    assert_not_equal Pirate.reflect_on_all_associations.length, received.length
+    assert_equal expected, received
+  end
+
   def test_has_many_reflection
     reflection_for_clients = ActiveRecord::Reflection::AssociationReflection.new(:has_many, :clients, { :order => "id", :dependent => :destroy }, Firm)
 
@@ -160,9 +170,9 @@ class ReflectionTest < ActiveRecord::TestCase
 
   def test_reflection_of_all_associations
     # FIXME these assertions bust a lot
-    assert_equal 26, Firm.reflect_on_all_associations.size
-    assert_equal 20, Firm.reflect_on_all_associations(:has_many).size
-    assert_equal 6, Firm.reflect_on_all_associations(:has_one).size
+    assert_equal 28, Firm.reflect_on_all_associations.size
+    assert_equal 21, Firm.reflect_on_all_associations(:has_many).size
+    assert_equal 7, Firm.reflect_on_all_associations(:has_one).size
     assert_equal 0, Firm.reflect_on_all_associations(:belongs_to).size
   end
 

data/test/cases/reload_models_test.rb

@@ -3,6 +3,8 @@ require 'models/owner'
 require 'models/pet'
 
 class ReloadModelsTest < ActiveRecord::TestCase
+  fixtures :pets
+
   def test_has_one_with_reload
     pet = Pet.find_by_name('parrot')
     pet.owner = Owner.find_by_name('ashley')
@@ -17,4 +19,4 @@ class ReloadModelsTest < ActiveRecord::TestCase
     pet.owner = Owner.find_by_name('ashley')
     assert_equal pet.owner, Owner.find_by_name('ashley')
   end
-end
+end

data/test/cases/repair_helper.rb

@@ -0,0 +1,50 @@
+module ActiveRecord
+  module Testing
+    module RepairHelper
+      def self.included(base)
+        base.class_eval do
+          extend ClassMethods
+        end
+      end
+
+      module Toolbox
+        def self.record_validations(*model_classes)
+          model_classes.inject({}) do |repair, klass|
+            repair[klass] ||= {}
+            [:validate, :validate_on_create, :validate_on_update].each do |callback|
+              the_callback = klass.instance_variable_get("@#{callback.to_s}_callbacks")
+              repair[klass][callback] = (the_callback.nil? ? nil : the_callback.dup)
+            end
+            repair
+          end
+        end
+
+        def self.reset_validations(recorded)
+          recorded.each do |klass, repairs|
+            [:validate, :validate_on_create, :validate_on_update].each do |callback|
+              klass.instance_variable_set("@#{callback.to_s}_callbacks", repairs[callback])
+            end
+          end
+        end
+      end
+
+      module ClassMethods
+        def repair_validations(*model_classes)
+          setup do
+            @validation_repairs = ActiveRecord::Testing::RepairHelper::Toolbox.record_validations(*model_classes)
+          end
+          teardown do
+            ActiveRecord::Testing::RepairHelper::Toolbox.reset_validations(@validation_repairs)
+          end
+        end
+      end
+
+      def repair_validations(*model_classes, &block)
+        validation_repairs = ActiveRecord::Testing::RepairHelper::Toolbox.record_validations(*model_classes)
+        return block.call
+      ensure
+        ActiveRecord::Testing::RepairHelper::Toolbox.reset_validations(validation_repairs)
+      end
+    end
+  end
+end

data/test/cases/schema_dumper_test.rb

@@ -1,5 +1,4 @@
 require "cases/helper"
-require 'active_record/schema_dumper'
 require 'stringio'
 
 

data/test/cases/transactions_test.rb

@@ -213,22 +213,143 @@ class TransactionTest < ActiveRecord::TestCase
     assert Topic.find(2).approved?, "Second should still be approved"
   end
 
-  uses_mocha 'mocking connection.commit_db_transaction' do
-    def test_rollback_when_commit_raises
-      Topic.connection.expects(:begin_db_transaction)
-      Topic.connection.expects(:transaction_active?).returns(true) if current_adapter?(:PostgreSQLAdapter)
-      Topic.connection.expects(:commit_db_transaction).raises('OH NOES')
-      Topic.connection.expects(:rollback_db_transaction)
+  def test_invalid_keys_for_transaction
+    assert_raise ArgumentError do
+      Topic.transaction :nested => true do
+      end
+    end
+  end
+
+  def test_force_savepoint_in_nested_transaction
+    Topic.transaction do
+      @first.approved = true
+      @second.approved = false
+      @first.save!
+      @second.save!
 
+      begin
+        Topic.transaction :requires_new => true do
+          @first.happy = false
+          @first.save!
+          raise
+        end
+      rescue
+      end
+    end
+
+    assert @first.reload.approved?
+    assert !@second.reload.approved?
+  end if Topic.connection.supports_savepoints?
+
+  def test_no_savepoint_in_nested_transaction_without_force
+    Topic.transaction do
+      @first.approved = true
+      @second.approved = false
+      @first.save!
+      @second.save!
+
+      begin
+        Topic.transaction do
+          @first.approved = false
+          @first.save!
+          raise
+        end
+      rescue
+      end
+    end
+
+    assert !@first.reload.approved?
+    assert !@second.reload.approved?
+  end if Topic.connection.supports_savepoints?
+  
+  def test_many_savepoints
+    Topic.transaction do
+      @first.content = "One"
+      @first.save!
+      
+      begin
+        Topic.transaction :requires_new => true do
+          @first.content = "Two"
+          @first.save!
+          
+          begin
+            Topic.transaction :requires_new => true do
+              @first.content = "Three"
+              @first.save!
+              
+              begin
+                Topic.transaction :requires_new => true do
+                  @first.content = "Four"
+                  @first.save!
+                  raise
+                end
+              rescue
+              end
+              
+              @three = @first.reload.content
+              raise
+            end
+          rescue
+          end
+          
+          @two = @first.reload.content
+          raise
+        end
+      rescue
+      end
+      
+      @one = @first.reload.content
+    end
+    
+    assert_equal "One", @one
+    assert_equal "Two", @two
+    assert_equal "Three", @three
+  end if Topic.connection.supports_savepoints?
+
+  def test_rollback_when_commit_raises
+    Topic.connection.expects(:begin_db_transaction)
+    Topic.connection.expects(:commit_db_transaction).raises('OH NOES')
+    Topic.connection.expects(:outside_transaction?).returns(false)
+    Topic.connection.expects(:rollback_db_transaction)
+
+    assert_raise RuntimeError do
+      Topic.transaction do
+        # do nothing
+      end
+    end
+  end
+  
+  if current_adapter?(:PostgreSQLAdapter) && defined?(PGconn::PQTRANS_IDLE)
+    def test_outside_transaction_works
+      assert Topic.connection.outside_transaction?
+      Topic.connection.begin_db_transaction
+      assert !Topic.connection.outside_transaction?
+      Topic.connection.rollback_db_transaction
+      assert Topic.connection.outside_transaction?
+    end
+    
+    def test_rollback_wont_be_executed_if_no_transaction_active
       assert_raise RuntimeError do
         Topic.transaction do
-          # do nothing
+          Topic.connection.rollback_db_transaction
+          Topic.connection.expects(:rollback_db_transaction).never
+          raise "Rails doesn't scale!"
         end
       end
     end
+    
+    def test_open_transactions_count_is_reset_to_zero_if_no_transaction_active
+      Topic.transaction do
+        Topic.transaction do
+          Topic.connection.rollback_db_transaction
+        end
+        assert_equal 0, Topic.connection.open_transactions
+      end
+      assert_equal 0, Topic.connection.open_transactions
+    end
   end
 
-  def test_sqlite_add_column_in_transaction_raises_statement_invalid
+  def test_sqlite_add_column_in_transaction
     return true unless current_adapter?(:SQLite3Adapter, :SQLiteAdapter)
 
     # Test first if column creation/deletion works correctly when no
@@ -247,10 +368,15 @@ class TransactionTest < ActiveRecord::TestCase
       assert !Topic.column_names.include?('stuff')
     end
 
-    # Test now inside a transaction: add_column should raise a StatementInvalid
-    Topic.transaction do
-      assert_raises(ActiveRecord::StatementInvalid) { Topic.connection.add_column('topics', 'stuff', :string) }
-      raise ActiveRecord::Rollback
+    if Topic.connection.supports_ddl_transactions?
+      assert_nothing_raised do
+        Topic.transaction { Topic.connection.add_column('topics', 'stuff', :string) }
+      end
+    else
+      Topic.transaction do
+        assert_raise(ActiveRecord::StatementInvalid) { Topic.connection.add_column('topics', 'stuff', :string) }
+        raise ActiveRecord::Rollback
+      end
     end
   end
 
@@ -282,6 +408,45 @@ class TransactionTest < ActiveRecord::TestCase
     end
 end
 
+class TransactionsWithTransactionalFixturesTest < ActiveRecord::TestCase
+  self.use_transactional_fixtures = true
+  fixtures :topics
+
+  def test_automatic_savepoint_in_outer_transaction
+    @first = Topic.find(1)
+    
+    begin
+      Topic.transaction do
+        @first.approved = true
+        @first.save!
+        raise
+      end
+    rescue
+      assert !@first.reload.approved?
+    end
+  end
+
+  def test_no_automatic_savepoint_for_inner_transaction
+    @first = Topic.find(1)
+
+    Topic.transaction do
+      @first.approved = true
+      @first.save!
+
+      begin
+        Topic.transaction do
+          @first.approved = false
+          @first.save!
+          raise
+        end
+      rescue
+      end
+    end
+
+    assert !@first.reload.approved?
+  end
+end if Topic.connection.supports_savepoints?
+
 if current_adapter?(:PostgreSQLAdapter)
   class ConcurrentTransactionTest < TransactionTest
     use_concurrent_connections

data/test/cases/validations_i18n_test.rb

@@ -2,7 +2,7 @@ require "cases/helper"
 require 'models/topic'
 require 'models/reply'
 
-class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
+class ActiveRecordValidationsI18nTests < ActiveSupport::TestCase
   def setup
     reset_callbacks Topic
     @topic = Topic.new
@@ -71,359 +71,353 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
 
   # ActiveRecord::Errors
-  uses_mocha 'ActiveRecord::Errors' do
+  def test_errors_generate_message_translates_custom_model_attribute_key
 
-    def test_errors_generate_message_translates_custom_model_attribute_key
-
-      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(
+      :"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
+
+    I18n.expects(:translate).with(
+      :reply,
+      { :count => 1,
+        :default => [:topic, 'Reply'],
+        :scope => [:activerecord, :models]
+      }
+    ).returns('Reply')
 
-      I18n.expects(:translate).with(
+    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",
-        :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
-
-      I18n.expects(:translate).with(
-        :reply,
-        { :count => 1,
-          :default => [:topic, 'Reply'],
-          :scope => [:activerecord, :models]
-        }
-      ).returns('Reply')
+        :"models.topic.invalid",
+        'default from class def',
+        :"messages.invalid"],
+      :model => 'Reply',
+      :attribute => 'Title'
+    ).returns("default from class def")
 
-      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'
+    Reply.new.errors.generate_message :title, :invalid, :default => 'default from class def'
 
-    end
+  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
+    @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_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
+    @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_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'
-    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'
   end
 
   # 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
+  # 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
+  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_acceptance_of w/ mocha
+  # 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
+    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_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_presence_of w/ mocha
+  # 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
+    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_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
+    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_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
+    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_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
+  # 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
+    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_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
+    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_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
+  # 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
+    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_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
+  # 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, :value => 'unique!'})
-      @topic.valid?
-    end
+  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, :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', :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', :value => 'unique!'})
+    @topic.valid?
+  end
 
-    # validates_format_of w/ mocha
+  # 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
+    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_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
+  # 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
+    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_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
+  # 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
+    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_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
+  # 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
+    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_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
+  # 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
+    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_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
+  # 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
+    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_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
+  # 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_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_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
+  # 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
+    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_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_confirmation_of w/o mocha