Update mocha version to 0.13.0 and change requires

Gemfile

@@ -22,7 +22,7 @@ end
 gem 'uglifier', '>= 1.0.3', :require => false
 
 gem 'rake', '>= 0.8.7'
-gem 'mocha', '~> 0.12.1'
+gem 'mocha', '>= 0.13.0', :require => false
 
 group :doc do
   # The current sdoc cannot generate GitHub links due

actionpack/test/template/sprockets_helper_test.rb

@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'sprockets'
 require 'sprockets/helpers/rails_helper'
-require 'mocha'
+require 'mocha/setup'
 
 class SprocketsHelperTest < ActionView::TestCase
   include Sprockets::Helpers::RailsHelper

actionpack/test/template/sprockets_helper_with_routes_test.rb

@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'sprockets'
 require 'sprockets/helpers/rails_helper'
-require 'mocha'
+require 'mocha/setup'
 
 class SprocketsHelperWithRoutesTest < ActionView::TestCase
   include Sprockets::Helpers::RailsHelper
@@ -54,4 +54,4 @@ class SprocketsHelperWithRoutesTest < ActionView::TestCase
       stylesheet_link_tag(:application)
   end
 
-end
+end

activerecord/test/cases/helper.rb

@@ -4,7 +4,7 @@ require 'config'
 
 require 'test/unit'
 require 'stringio'
-require 'mocha'
+require 'mocha/setup'
 
 require 'active_record'
 require 'active_support/dependencies'

activeresource/test/cases/base_test.rb

@@ -10,7 +10,7 @@ require "fixtures/subscription_plan"
 require 'active_support/json'
 require 'active_support/ordered_hash'
 require 'active_support/core_ext/hash/conversions'
-require 'mocha'
+require 'mocha/setup'
 
 class BaseTest < Test::Unit::TestCase
   def setup

activesupport/lib/active_support/testing/mochaing.rb

@@ -4,4 +4,4 @@ rescue LoadError
   # Fake Mocha::ExpectationError so we can rescue it in #run. Bleh.
   Object.const_set :Mocha, Module.new
   Mocha.const_set :ExpectationError, Class.new(StandardError)
-end
+end

activesupport/lib/active_support/testing/setup_and_teardown.rb

@@ -116,7 +116,6 @@ module ActiveSupport
           end
         end
       end
-
     end
   end
 end

activesupport/test/abstract_unit.rb

@@ -25,7 +25,7 @@ end
 require 'test/unit'
 require 'empty_bool'
 
-silence_warnings { require 'mocha' }
+silence_warnings { require 'mocha/setup' }
 
 ENV['NO_RELOAD'] = '1'
 require 'active_support'

railties/test/application/rack/logger_test.rb

@@ -1,6 +1,7 @@
 require "isolation/abstract_unit"
 require "active_support/log_subscriber/test_helper"
 require "rack/test"
+require "mocha/setup"
 
 module ApplicationTests
   module RackTests

railties/test/application/route_inspect_test.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require 'mocha'
+require 'mocha/setup'
 require 'rails/application/route_inspector'
 require 'action_controller'
 require 'rails/engine'

railties/test/generators_test.rb

@@ -1,7 +1,7 @@
 require 'generators/generators_test_helper'
 require 'rails/generators/rails/model/model_generator'
 require 'rails/generators/test_unit/model/model_generator'
-require 'mocha'
+require 'mocha/setup'
 
 class GeneratorsTest < Rails::Generators::TestCase
   include GeneratorsTestHelper
@@ -201,7 +201,7 @@ class GeneratorsTest < Rails::Generators::TestCase
     mspec = Rails::Generators.find_by_namespace :fixjour
     assert mspec.source_paths.include?(File.join(Rails.root, "lib", "templates", "fixjour"))
   end
-  
+
   def test_usage_with_embedded_ruby
     require File.expand_path("fixtures/lib/generators/usage_template/usage_template_generator", File.dirname(__FILE__))
     output = capture(:stdout) { Rails::Generators.invoke :usage_template, ['--help'] }