Skip to content
Browse files

Update mocha version to 0.13.0 and change requires

  • Loading branch information...
1 parent d116e90 commit 871a7dbb4492f3bc427982559b66eb5140e4c8fe @carlosantoniodasilva carlosantoniodasilva committed
View
2 Gemfile
@@ -3,7 +3,7 @@ source 'http://rubygems.org'
gemspec
gem "rake", ">= 0.8.7"
-gem "mocha", "0.10.5"
+gem 'mocha', '>= 0.13.0', :require => false
group :doc do
gem "rdoc", "~> 3.4"
View
2 activerecord/test/cases/helper.rb
@@ -4,7 +4,7 @@
require 'test/unit'
require 'stringio'
-require 'mocha'
+require 'mocha/setup'
require 'active_record'
require 'active_support/dependencies'
View
2 activeresource/test/cases/base_test.rb
@@ -8,7 +8,7 @@
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
View
1 activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -109,7 +109,6 @@ def retrieve_mocha_counter(test_case, result) #:nodoc:
end
end
end
-
end
end
end
View
2 activesupport/test/abstract_unit.rb
@@ -25,7 +25,7 @@
require 'test/unit'
require 'empty_bool'
-silence_warnings { require 'mocha' }
+silence_warnings { require 'mocha/setup' }
ENV['NO_RELOAD'] = '1'
require 'active_support'
View
2 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

0 comments on commit 871a7db

Please sign in to comment.
Something went wrong with that request. Please try again.