Bump mocha requirement for Ruby 1.9 compat. Remove uses_mocha.

12 files changed, 570 insertions, 613 deletions

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 1e3b423471..0f43d97f4a 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
@@ -767,12 +767,10 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 1, developer.projects.count
   end
 
-  uses_mocha 'mocking Post.transaction' do
-    def test_association_proxy_transaction_method_starts_transaction_in_association_class
-      Post.expects(:transaction)
-      Category.find(:first).posts.transaction do
-        # nothing
-      end
+  def test_association_proxy_transaction_method_starts_transaction_in_association_class
+    Post.expects(:transaction)
+    Category.find(:first).posts.transaction do
+      # nothing
     end
   end
 
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index 428fb50013..a2525f1d70 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -1097,12 +1097,10 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     ActiveRecord::Base.store_full_sti_class = old
   end
 
-  uses_mocha 'mocking Comment.transaction' do
-    def test_association_proxy_transaction_method_starts_transaction_in_association_class
-      Comment.expects(:transaction)
-      Post.find(:first).comments.transaction do
-        # nothing
-      end
+  def test_association_proxy_transaction_method_starts_transaction_in_association_class
+    Comment.expects(:transaction)
+    Post.find(:first).comments.transaction do
+      # nothing
     end
   end
 
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 ad6a5d6840..1e5d1a0202 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -228,12 +228,10 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     assert !person.posts.loaded?
   end
 
-  uses_mocha 'mocking Tag.transaction' do
-    def test_association_proxy_transaction_method_starts_transaction_in_association_class
-      Tag.expects(:transaction)
-      Post.find(:first).tags.transaction do
-        # nothing
-      end
+  def test_association_proxy_transaction_method_starts_transaction_in_association_class
+    Tag.expects(:transaction)
+    Post.find(:first).tags.transaction do
+      # nothing
     end
   end
 
diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb
index 7a0427aabc..b1060d01af 100644
--- a/activerecord/test/cases/associations/join_model_test.rb
+++ b/activerecord/test/cases/associations/join_model_test.rb
@@ -510,13 +510,11 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
     assert !author.comments.loaded?
   end
 
-  uses_mocha('has_many_through_collection_size_uses_counter_cache_if_it_exists') do
-    def test_has_many_through_collection_size_uses_counter_cache_if_it_exists
-      author = authors(:david)
-      author.stubs(:read_attribute).with('comments_count').returns(100)
-      assert_equal 100, author.comments.size
-      assert !author.comments.loaded?
-    end
+  def test_has_many_through_collection_size_uses_counter_cache_if_it_exists
+    author = authors(:david)
+    author.stubs(:read_attribute).with('comments_count').returns(100)
+    assert_equal 100, author.comments.size
+    assert !author.comments.loaded?
   end
 
   def test_adding_junk_to_has_many_through_should_raise_type_mismatch
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index 080f6a7007..5a4ed429b6 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -156,25 +156,23 @@ class CalculationsTest < ActiveRecord::TestCase
     assert_equal 1, c[companies(:first_client)]
   end
 
-  uses_mocha 'group_by_non_numeric_foreign_key_association' do
-    def test_should_group_by_association_with_non_numeric_foreign_key
-      ActiveRecord::Base.connection.expects(:select_all).returns([{"count_all" => 1, "firm_id" => "ABC"}])
-
-      firm = mock()
-      firm.expects(:id).returns("ABC")
-      firm.expects(:class).returns(Firm)
-      Company.expects(:find).with(["ABC"]).returns([firm])
-
-      column = mock()
-      column.expects(:name).at_least_once.returns(:firm_id)
-      column.expects(:type_cast).with("ABC").returns("ABC")
-      Account.expects(:columns).at_least_once.returns([column])
-
-      c = Account.count(:all, :group => :firm)
-      first_key = c.keys.first
-      assert_equal Firm, first_key.class
-      assert_equal 1, c[first_key]
-    end
+  def test_should_group_by_association_with_non_numeric_foreign_key
+    ActiveRecord::Base.connection.expects(:select_all).returns([{"count_all" => 1, "firm_id" => "ABC"}])
+
+    firm = mock()
+    firm.expects(:id).returns("ABC")
+    firm.expects(:class).returns(Firm)
+    Company.expects(:find).with(["ABC"]).returns([firm])
+
+    column = mock()
+    column.expects(:name).at_least_once.returns(:firm_id)
+    column.expects(:type_cast).with("ABC").returns("ABC")
+    Account.expects(:columns).at_least_once.returns([column])
+
+    c = Account.count(:all, :group => :firm)
+    first_key = c.keys.first
+    assert_equal Firm, first_key.class
+    assert_equal 1, c[first_key]
   end
 
   def test_should_calculate_grouped_association_with_foreign_key_option
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index d4d770b04e..7fd7fd7a5b 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -507,21 +507,19 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal(2, Entrant.count_by_sql(["SELECT COUNT(*) FROM entrants WHERE id > ?", 1]))
   end
 
-  uses_mocha('test_dynamic_finder_should_go_through_the_find_class_method') do
-    def test_dynamic_finders_should_go_through_the_find_class_method
-      Topic.expects(:find).with(:first, :conditions => { :title => 'The First Topic!' })
-      Topic.find_by_title("The First Topic!")
+  def test_dynamic_finders_should_go_through_the_find_class_method
+    Topic.expects(:find).with(:first, :conditions => { :title => 'The First Topic!' })
+    Topic.find_by_title("The First Topic!")
 
-      Topic.expects(:find).with(:last, :conditions => { :title => 'The Last Topic!' })
-      Topic.find_last_by_title("The Last Topic!")
+    Topic.expects(:find).with(:last, :conditions => { :title => 'The Last Topic!' })
+    Topic.find_last_by_title("The Last Topic!")
 
-      Topic.expects(:find).with(:all, :conditions => { :title => 'A Topic.' })
-      Topic.find_all_by_title("A Topic.")
+    Topic.expects(:find).with(:all, :conditions => { :title => 'A Topic.' })
+    Topic.find_all_by_title("A Topic.")
 
-      Topic.expects(:find).with(:first, :conditions => { :title => 'Does not exist yet for sure!' }).times(2)
-      Topic.find_or_initialize_by_title('Does not exist yet for sure!')
-      Topic.find_or_create_by_title('Does not exist yet for sure!')
-    end
+    Topic.expects(:find).with(:first, :conditions => { :title => 'Does not exist yet for sure!' }).times(2)
+    Topic.find_or_initialize_by_title('Does not exist yet for sure!')
+    Topic.find_or_create_by_title('Does not exist yet for sure!')
   end
 
   def test_find_by_one_attribute
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index ed2915b023..eb63fd5f34 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -265,12 +265,10 @@ class FixturesWithoutInstantiationTest < ActiveRecord::TestCase
     assert_raise(StandardError) { topics([:first, :second]) }
   end
 
-  uses_mocha 'reloading_fixtures_through_accessor_methods' do
-    def test_reloading_fixtures_through_accessor_methods
-      assert_equal "The First Topic", topics(:first).title
-      @loaded_fixtures['topics']['first'].expects(:find).returns(stub(:title => "Fresh Topic!"))
-      assert_equal "Fresh Topic!", topics(:first, true).title
-    end
+  def test_reloading_fixtures_through_accessor_methods
+    assert_equal "The First Topic", topics(:first).title
+    @loaded_fixtures['topics']['first'].expects(:find).returns(stub(:title => "Fresh Topic!"))
+    assert_equal "Fresh Topic!", topics(:first, true).title
   end
 end
 
@@ -639,17 +637,15 @@ class ActiveSupportSubclassWithFixturesTest < ActiveRecord::TestCase
 end
 
 class FixtureLoadingTest < ActiveRecord::TestCase
-  uses_mocha 'reloading_fixtures_through_accessor_methods' do
-    def test_logs_message_for_failed_dependency_load
-      ActiveRecord::TestCase.expects(:require_dependency).with(:does_not_exist).raises(LoadError)
-      ActiveRecord::Base.logger.expects(:warn)
-      ActiveRecord::TestCase.try_to_load_dependency(:does_not_exist)
-    end
+  def test_logs_message_for_failed_dependency_load
+    ActiveRecord::TestCase.expects(:require_dependency).with(:does_not_exist).raises(LoadError)
+    ActiveRecord::Base.logger.expects(:warn)
+    ActiveRecord::TestCase.try_to_load_dependency(:does_not_exist)
+  end
 
-    def test_does_not_logs_message_for_successful_dependency_load
-      ActiveRecord::TestCase.expects(:require_dependency).with(:works_out_fine)
-      ActiveRecord::Base.logger.expects(:warn).never
-      ActiveRecord::TestCase.try_to_load_dependency(:works_out_fine)
-    end
+  def test_does_not_logs_message_for_successful_dependency_load
+    ActiveRecord::TestCase.expects(:require_dependency).with(:works_out_fine)
+    ActiveRecord::Base.logger.expects(:warn).never
+    ActiveRecord::TestCase.try_to_load_dependency(:works_out_fine)
   end
 end
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index 24ce35e2e2..1ec52ac24d 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -2,7 +2,11 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib')
 $:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
 
 require 'config'
+
+require 'rubygems'
 require 'test/unit'
+gem 'mocha', '>= 0.9.5'
+require 'mocha'
 
 require 'active_record'
 require 'active_record/test_case'
@@ -24,15 +28,6 @@ def current_adapter?(*types)
   end
 end
 
-def uses_mocha(description)
-  require 'rubygems'
-  gem 'mocha', '>= 0.9.3'
-  require 'mocha'
-  yield
-rescue LoadError
-  $stderr.puts "Skipping #{description} tests. `gem install mocha` and try again."
-end
-
 ActiveRecord::Base.connection.class.class_eval do
   IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /SHOW FIELDS/]
 
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 2ec3d40332..1c974e4825 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -219,22 +219,20 @@ if ActiveRecord::Base.connection.supports_migrations?
       ActiveRecord::Base.primary_key_prefix_type = nil
     end
 
-    uses_mocha('test_create_table_with_force_true_does_not_drop_nonexisting_table') do
-      def test_create_table_with_force_true_does_not_drop_nonexisting_table
-        if Person.connection.table_exists?(:testings2)
-          Person.connection.drop_table :testings2
-        end
+    def test_create_table_with_force_true_does_not_drop_nonexisting_table
+      if Person.connection.table_exists?(:testings2)
+        Person.connection.drop_table :testings2
+      end
 
-        # using a copy as we need the drop_table method to
-        # continue to work for the ensure block of the test
-        temp_conn = Person.connection.dup
-        temp_conn.expects(:drop_table).never
-        temp_conn.create_table :testings2, :force => true do |t|
-          t.column :foo, :string
-        end
-      ensure
-        Person.connection.drop_table :testings2 rescue nil
+      # using a copy as we need the drop_table method to
+      # continue to work for the ensure block of the test
+      temp_conn = Person.connection.dup
+      temp_conn.expects(:drop_table).never
+      temp_conn.create_table :testings2, :force => true do |t|
+        t.column :foo, :string
       end
+    ensure
+      Person.connection.drop_table :testings2 rescue nil
     end
 
     def test_create_table_with_timestamps_should_create_datetime_columns
@@ -1203,277 +1201,271 @@ if ActiveRecord::Base.connection.supports_migrations?
 
   end
   
-  uses_mocha 'Sexy migration tests' do
-    class SexyMigrationsTest < ActiveRecord::TestCase
-      def test_references_column_type_adds_id
-        with_new_table do |t|
-          t.expects(:column).with('customer_id', :integer, {})
-          t.references :customer
-        end
+  class SexyMigrationsTest < ActiveRecord::TestCase
+    def test_references_column_type_adds_id
+      with_new_table do |t|
+        t.expects(:column).with('customer_id', :integer, {})
+        t.references :customer
       end
+    end
 
-      def test_references_column_type_with_polymorphic_adds_type
-        with_new_table do |t|
-          t.expects(:column).with('taggable_type', :string, {})
-          t.expects(:column).with('taggable_id', :integer, {})
-          t.references :taggable, :polymorphic => true
-        end
+    def test_references_column_type_with_polymorphic_adds_type
+      with_new_table do |t|
+        t.expects(:column).with('taggable_type', :string, {})
+        t.expects(:column).with('taggable_id', :integer, {})
+        t.references :taggable, :polymorphic => true
       end
+    end
 
-      def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag
-        with_new_table do |t|
-          t.expects(:column).with('taggable_type', :string, {:null => false})
-          t.expects(:column).with('taggable_id', :integer, {:null => false})
-          t.references :taggable, :polymorphic => true, :null => false
-        end
+    def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag
+      with_new_table do |t|
+        t.expects(:column).with('taggable_type', :string, {:null => false})
+        t.expects(:column).with('taggable_id', :integer, {:null => false})
+        t.references :taggable, :polymorphic => true, :null => false
       end
+    end
 
-      def test_belongs_to_works_like_references
-        with_new_table do |t|
-          t.expects(:column).with('customer_id', :integer, {})
-          t.belongs_to :customer
-        end
+    def test_belongs_to_works_like_references
+      with_new_table do |t|
+        t.expects(:column).with('customer_id', :integer, {})
+        t.belongs_to :customer
       end
+    end
 
-      def test_timestamps_creates_updated_at_and_created_at
-        with_new_table do |t|
-          t.expects(:column).with(:created_at, :datetime, kind_of(Hash))
-          t.expects(:column).with(:updated_at, :datetime, kind_of(Hash))
-          t.timestamps
-        end
+    def test_timestamps_creates_updated_at_and_created_at
+      with_new_table do |t|
+        t.expects(:column).with(:created_at, :datetime, kind_of(Hash))
+        t.expects(:column).with(:updated_at, :datetime, kind_of(Hash))
+        t.timestamps
       end
+    end
 
-      def test_integer_creates_integer_column
-        with_new_table do |t|
-          t.expects(:column).with(:foo, 'integer', {})
-          t.expects(:column).with(:bar, 'integer', {})
-          t.integer :foo, :bar
-        end
+    def test_integer_creates_integer_column
+      with_new_table do |t|
+        t.expects(:column).with(:foo, 'integer', {})
+        t.expects(:column).with(:bar, 'integer', {})
+        t.integer :foo, :bar
       end
+    end
 
-      def test_string_creates_string_column
-        with_new_table do |t|
-          t.expects(:column).with(:foo, 'string', {})
-          t.expects(:column).with(:bar, 'string', {})
-          t.string :foo, :bar
-        end
+    def test_string_creates_string_column
+      with_new_table do |t|
+        t.expects(:column).with(:foo, 'string', {})
+        t.expects(:column).with(:bar, 'string', {})
+        t.string :foo, :bar
       end
+    end
 
-      protected
-      def with_new_table
-        Person.connection.create_table :delete_me, :force => true do |t|
-          yield t
-        end
-      ensure
-        Person.connection.drop_table :delete_me rescue nil
+    protected
+    def with_new_table
+      Person.connection.create_table :delete_me, :force => true do |t|
+        yield t
       end
+    ensure
+      Person.connection.drop_table :delete_me rescue nil
+    end
 
-    end # SexyMigrationsTest
-  end # uses_mocha
+  end # SexyMigrationsTest
 
-  uses_mocha 'ChangeTable migration tests' do
-    class ChangeTableMigrationsTest < ActiveRecord::TestCase
-      def setup
-        @connection = Person.connection
-        @connection.create_table :delete_me, :force => true do |t|
-        end
+  class ChangeTableMigrationsTest < ActiveRecord::TestCase
+    def setup
+      @connection = Person.connection
+      @connection.create_table :delete_me, :force => true do |t|
       end
+    end
 
-      def teardown
-        Person.connection.drop_table :delete_me rescue nil
-      end
+    def teardown
+      Person.connection.drop_table :delete_me rescue nil
+    end
 
-      def test_references_column_type_adds_id
-        with_change_table do |t|
-          @connection.expects(:add_column).with(:delete_me, 'customer_id', :integer, {})
-          t.references :customer
-        end
+    def test_references_column_type_adds_id
+      with_change_table do |t|
+        @connection.expects(:add_column).with(:delete_me, 'customer_id', :integer, {})
+        t.references :customer
       end
+    end
 
-      def test_remove_references_column_type_removes_id
-        with_change_table do |t|
-          @connection.expects(:remove_column).with(:delete_me, 'customer_id')
-          t.remove_references :customer
-        end
+    def test_remove_references_column_type_removes_id
+      with_change_table do |t|
+        @connection.expects(:remove_column).with(:delete_me, 'customer_id')
+        t.remove_references :customer
       end
+    end
 
-      def test_add_belongs_to_works_like_add_references
-        with_change_table do |t|
-          @connection.expects(:add_column).with(:delete_me, 'customer_id', :integer, {})
-          t.belongs_to :customer
-        end
+    def test_add_belongs_to_works_like_add_references
+      with_change_table do |t|
+        @connection.expects(:add_column).with(:delete_me, 'customer_id', :integer, {})
+        t.belongs_to :customer
       end
+    end
 
-      def test_remove_belongs_to_works_like_remove_references
-        with_change_table do |t|
-          @connection.expects(:remove_column).with(:delete_me, 'customer_id')
-          t.remove_belongs_to :customer
-        end
+    def test_remove_belongs_to_works_like_remove_references
+      with_change_table do |t|
+        @connection.expects(:remove_column).with(:delete_me, 'customer_id')
+        t.remove_belongs_to :customer
       end
+    end
 
-      def test_references_column_type_with_polymorphic_adds_type
-        with_change_table do |t|
-          @connection.expects(:add_column).with(:delete_me, 'taggable_type', :string, {})
-          @connection.expects(:add_column).with(:delete_me, 'taggable_id', :integer, {})
-          t.references :taggable, :polymorphic => true
-        end
+    def test_references_column_type_with_polymorphic_adds_type
+      with_change_table do |t|
+        @connection.expects(:add_column).with(:delete_me, 'taggable_type', :string, {})
+        @connection.expects(:add_column).with(:delete_me, 'taggable_id', :integer, {})
+        t.references :taggable, :polymorphic => true
       end
+    end
 
-      def test_remove_references_column_type_with_polymorphic_removes_type
-        with_change_table do |t|
-          @connection.expects(:remove_column).with(:delete_me, 'taggable_type')
-          @connection.expects(:remove_column).with(:delete_me, 'taggable_id')
-          t.remove_references :taggable, :polymorphic => true
-        end
+    def test_remove_references_column_type_with_polymorphic_removes_type
+      with_change_table do |t|
+        @connection.expects(:remove_column).with(:delete_me, 'taggable_type')
+        @connection.expects(:remove_column).with(:delete_me, 'taggable_id')
+        t.remove_references :taggable, :polymorphic => true
       end
+    end
 
-      def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag
-        with_change_table do |t|
-          @connection.expects(:add_column).with(:delete_me, 'taggable_type', :string, {:null => false})
-          @connection.expects(:add_column).with(:delete_me, 'taggable_id', :integer, {:null => false})
-          t.references :taggable, :polymorphic => true, :null => false
-        end
+    def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag
+      with_change_table do |t|
+        @connection.expects(:add_column).with(:delete_me, 'taggable_type', :string, {:null => false})
+        @connection.expects(:add_column).with(:delete_me, 'taggable_id', :integer, {:null => false})
+        t.references :taggable, :polymorphic => true, :null => false
       end
+    end
 
-      def test_remove_references_column_type_with_polymorphic_and_options_null_is_false_removes_table_flag
-        with_change_table do |t|
-          @connection.expects(:remove_column).with(:delete_me, 'taggable_type')
-          @connection.expects(:remove_column).with(:delete_me, 'taggable_id')
-          t.remove_references :taggable, :polymorphic => true, :null => false
-        end
+    def test_remove_references_column_type_with_polymorphic_and_options_null_is_false_removes_table_flag
+      with_change_table do |t|
+        @connection.expects(:remove_column).with(:delete_me, 'taggable_type')
+        @connection.expects(:remove_column).with(:delete_me, 'taggable_id')
+        t.remove_references :taggable, :polymorphic => true, :null => false
       end
+    end
 
-      def test_timestamps_creates_updated_at_and_created_at
-        with_change_table do |t|
-          @connection.expects(:add_timestamps).with(:delete_me)
-          t.timestamps
-        end
+    def test_timestamps_creates_updated_at_and_created_at
+      with_change_table do |t|
+        @connection.expects(:add_timestamps).with(:delete_me)
+        t.timestamps
       end
+    end
 
-      def test_remove_timestamps_creates_updated_at_and_created_at
-        with_change_table do |t|
-          @connection.expects(:remove_timestamps).with(:delete_me)
-          t.remove_timestamps
-        end
+    def test_remove_timestamps_creates_updated_at_and_created_at
+      with_change_table do |t|
+        @connection.expects(:remove_timestamps).with(:delete_me)
+        t.remove_timestamps
       end
+    end
 
-      def string_column
-        if current_adapter?(:PostgreSQLAdapter)
-          "character varying(255)"
-        else
-          'varchar(255)'
-        end
+    def string_column
+      if current_adapter?(:PostgreSQLAdapter)
+        "character varying(255)"
+      else
+        'varchar(255)'
       end
+    end
 
-      def integer_column
-        if current_adapter?(:MysqlAdapter)
-          'int(11)'
-        else
-          'integer'
-        end
+    def integer_column
+      if current_adapter?(:MysqlAdapter)
+        'int(11)'
+      else
+        'integer'
       end
+    end
 
-      def test_integer_creates_integer_column
-        with_change_table do |t|
-          @connection.expects(:add_column).with(:delete_me, :foo, integer_column, {})
-          @connection.expects(:add_column).with(:delete_me, :bar, integer_column, {})
-          t.integer :foo, :bar
-        end
+    def test_integer_creates_integer_column
+      with_change_table do |t|
+        @connection.expects(:add_column).with(:delete_me, :foo, integer_column, {})
+        @connection.expects(:add_column).with(:delete_me, :bar, integer_column, {})
+        t.integer :foo, :bar
       end
+    end
 
-      def test_string_creates_string_column
-        with_change_table do |t|
-          @connection.expects(:add_column).with(:delete_me, :foo, string_column, {})
-          @connection.expects(:add_column).with(:delete_me, :bar, string_column, {})
-          t.string :foo, :bar
-        end
+    def test_string_creates_string_column
+      with_change_table do |t|
+        @connection.expects(:add_column).with(:delete_me, :foo, string_column, {})
+        @connection.expects(:add_column).with(:delete_me, :bar, string_column, {})
+        t.string :foo, :bar
       end
+    end
 
-      def test_column_creates_column
-        with_change_table do |t|
-          @connection.expects(:add_column).with(:delete_me, :bar, :integer, {})
-          t.column :bar, :integer
-        end
+    def test_column_creates_column
+      with_change_table do |t|
+        @connection.expects(:add_column).with(:delete_me, :bar, :integer, {})
+        t.column :bar, :integer
       end
+    end
 
-      def test_column_creates_column_with_options
-        with_change_table do |t|
-          @connection.expects(:add_column).with(:delete_me, :bar, :integer, {:null => false})
-          t.column :bar, :integer, :null => false
-        end
+    def test_column_creates_column_with_options
+      with_change_table do |t|
+        @connection.expects(:add_column).with(:delete_me, :bar, :integer, {:null => false})
+        t.column :bar, :integer, :null => false
       end
+    end
 
-      def test_index_creates_index
-        with_change_table do |t|
-          @connection.expects(:add_index).with(:delete_me, :bar, {})
-          t.index :bar
-        end
+    def test_index_creates_index
+      with_change_table do |t|
+        @connection.expects(:add_index).with(:delete_me, :bar, {})
+        t.index :bar
       end
+    end
 
-      def test_index_creates_index_with_options
-        with_change_table do |t|
-          @connection.expects(:add_index).with(:delete_me, :bar, {:unique => true})
-          t.index :bar, :unique => true
-        end
+    def test_index_creates_index_with_options
+      with_change_table do |t|
+        @connection.expects(:add_index).with(:delete_me, :bar, {:unique => true})
+        t.index :bar, :unique => true
       end
+    end
 
-      def test_change_changes_column
-        with_change_table do |t|
-          @connection.expects(:change_column).with(:delete_me, :bar, :string, {})
-          t.change :bar, :string
-        end
+    def test_change_changes_column
+      with_change_table do |t|
+        @connection.expects(:change_column).with(:delete_me, :bar, :string, {})
+        t.change :bar, :string
       end
+    end
 
-      def test_change_changes_column_with_options
-        with_change_table do |t|
-          @connection.expects(:change_column).with(:delete_me, :bar, :string, {:null => true})
-          t.change :bar, :string, :null => true
-        end
+    def test_change_changes_column_with_options
+      with_change_table do |t|
+        @connection.expects(:change_column).with(:delete_me, :bar, :string, {:null => true})
+        t.change :bar, :string, :null => true
       end
+    end
 
-      def test_change_default_changes_column
-        with_change_table do |t|
-          @connection.expects(:change_column_default).with(:delete_me, :bar, :string)
-          t.change_default :bar, :string
-        end
+    def test_change_default_changes_column
+      with_change_table do |t|
+        @connection.expects(:change_column_default).with(:delete_me, :bar, :string)
+        t.change_default :bar, :string
       end
+    end
 
-      def test_remove_drops_single_column
-        with_change_table do |t|
-          @connection.expects(:remove_column).with(:delete_me, [:bar])
-          t.remove :bar
-        end
+    def test_remove_drops_single_column
+      with_change_table do |t|
+        @connection.expects(:remove_column).with(:delete_me, [:bar])
+        t.remove :bar
       end
+    end
 
-      def test_remove_drops_multiple_columns
-        with_change_table do |t|
-          @connection.expects(:remove_column).with(:delete_me, [:bar, :baz])
-          t.remove :bar, :baz
-        end
+    def test_remove_drops_multiple_columns
+      with_change_table do |t|
+        @connection.expects(:remove_column).with(:delete_me, [:bar, :baz])
+        t.remove :bar, :baz
       end
+    end
 
-      def test_remove_index_removes_index_with_options
-        with_change_table do |t|
-          @connection.expects(:remove_index).with(:delete_me, {:unique => true})
-          t.remove_index :unique => true
-        end
+    def test_remove_index_removes_index_with_options
+      with_change_table do |t|
+        @connection.expects(:remove_index).with(:delete_me, {:unique => true})
+        t.remove_index :unique => true
       end
+    end
 
-      def test_rename_renames_column
-        with_change_table do |t|
-          @connection.expects(:rename_column).with(:delete_me, :bar, :baz)
-          t.rename :bar, :baz
-        end
+    def test_rename_renames_column
+      with_change_table do |t|
+        @connection.expects(:rename_column).with(:delete_me, :bar, :baz)
+        t.rename :bar, :baz
       end
+    end
 
-      protected
-      def with_change_table
-        Person.connection.change_table :delete_me do |t|
-          yield t
-        end
+    protected
+    def with_change_table
+      Person.connection.change_table :delete_me do |t|
+        yield t
       end
-
-    end # ChangeTable test
-  end # uses_mocha
-
+    end
+  end
 end
diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb
index 171d0e6dae..f90a66d1dc 100644
--- a/activerecord/test/cases/query_cache_test.rb
+++ b/activerecord/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
diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index 4a07a8bb1d..40abd935df 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -306,17 +306,15 @@ class TransactionTest < ActiveRecord::TestCase
     assert_equal "Three", @three
   end if Topic.connection.supports_savepoints?
 
-  uses_mocha 'mocking connection.commit_db_transaction' do
-    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)
+  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
+    assert_raise RuntimeError do
+      Topic.transaction do
+        # do nothing
       end
     end
   end
@@ -330,14 +328,12 @@ class TransactionTest < ActiveRecord::TestCase
       assert Topic.connection.outside_transaction?
     end
     
-    uses_mocha 'mocking connection.rollback_db_transaction' do
-      def test_rollback_wont_be_executed_if_no_transaction_active
-        assert_raise RuntimeError do
-          Topic.transaction do
-            Topic.connection.rollback_db_transaction
-            Topic.connection.expects(:rollback_db_transaction).never
-            raise "Rails doesn't scale!"
-          end
+    def test_rollback_wont_be_executed_if_no_transaction_active
+      assert_raise RuntimeError do
+        Topic.transaction do
+          Topic.connection.rollback_db_transaction
+          Topic.connection.expects(:rollback_db_transaction).never
+          raise "Rails doesn't scale!"
         end
       end
     end
diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index e893a704f1..66982346e9 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -71,359 +71,353 @@ class ActiveRecordValidationsI18nTests < ActiveSupport::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