Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update mocha version to 0.13.0 and change requires

Conflicts:
	Gemfile
	railties/test/application/route_inspect_test.rb
	railties/test/generators_test.rb
  • Loading branch information...
commit ae6864e9cda44aded1fa3ccee08759f37f6d3f6b 1 parent b0a2c67
@carlosantoniodasilva carlosantoniodasilva authored
View
2  Gemfile
@@ -13,7 +13,7 @@ gem "jquery-rails"
gem "uglifier", ">= 1.0.3", :require => false
gem "rake", ">= 0.8.7"
-gem "mocha", "0.10.5"
+gem 'mocha', '>= 0.13.0', :require => false
group :doc do
# The current sdoc cannot generate GitHub links due
View
2  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'
module Rails; end
View
4 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 @@ def setup
stylesheet_link_tag(:application)
end
-end
+end
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
@@ -10,7 +10,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
2  activesupport/lib/active_support/testing/mochaing.rb
@@ -4,4 +4,4 @@
# 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
View
1  activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -114,7 +114,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
1  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
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
Please sign in to comment.
Something went wrong with that request. Please try again.