Permalink
Browse files

Move mocha down below initial T::U require and bump version to 0.9.7 [#…

…2858 state:resolved]
  • Loading branch information...
1 parent 0515256 commit 7583a24ee0ea85d55a5e235c3082f1b67d3d7694 Yehuda Katz + Carl Lerche committed Jul 1, 2009
@@ -1,9 +1,6 @@
require 'rubygems'
require 'test/unit'
-gem 'mocha', '>= 0.9.5'
-require 'mocha'
-
$:.unshift "#{File.dirname(__FILE__)}/../lib"
$:.unshift "#{File.dirname(__FILE__)}/../../activesupport/lib"
$:.unshift "#{File.dirname(__FILE__)}/../../actionpack/lib"
@@ -12,9 +12,6 @@
require 'stringio'
require 'test/unit'
-gem 'mocha', '>= 0.9.5'
-require 'mocha'
-
begin
require 'ruby-debug'
Debugger.settings[:autoeval] = true
@@ -10,8 +10,6 @@
require 'rubygems'
require 'test/unit'
-gem 'mocha', '>= 0.9.5'
-require 'mocha'
begin
require 'ruby-debug'
@@ -6,8 +6,6 @@
require 'rubygems'
require 'test/unit'
require 'stringio'
-gem 'mocha', '>= 0.9.5'
-require 'mocha'
require 'active_record'
require 'active_record/test_case'
@@ -1,8 +1,6 @@
require 'rubygems'
require 'test/unit'
-
-gem 'mocha', '>= 0.9.5'
-require 'mocha'
+require 'active_support/test_case'
$:.unshift "#{File.dirname(__FILE__)}/../lib"
require 'active_resource'
@@ -1,12 +1,3 @@
-begin
- gem 'mocha', '>= 0.9.3'
- require 'mocha'
-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
-
require 'test/unit/testcase'
require 'active_support/testing/setup_and_teardown'
require 'active_support/testing/assertions'
@@ -15,6 +6,15 @@
require 'active_support/testing/pending'
require 'active_support/testing/isolation'
+begin
+ gem 'mocha', ">= 0.9.7"
+ require 'mocha'
+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
+
module ActiveSupport
class TestCase < ::Test::Unit::TestCase
if defined? MiniTest
@@ -2,7 +2,6 @@
require 'rubygems'
require 'test/unit'
-require 'mocha'
require 'i18n'
require 'active_support'
@@ -2,7 +2,6 @@
require 'rubygems'
require 'test/unit'
-require 'mocha'
require 'i18n'
require 'active_support'
@@ -3,7 +3,6 @@
require 'rubygems'
require 'test/unit'
-require 'mocha'
require 'i18n'
require 'time'
require 'yaml'
@@ -3,9 +3,6 @@
require 'rubygems'
require 'test/unit'
-gem 'mocha', '>= 0.9.5'
-require 'mocha'
-
ENV['NO_RELOAD'] = '1'
$:.unshift "#{File.dirname(__FILE__)}/../lib"
require 'active_support'
@@ -12,9 +12,6 @@
require 'rubygems'
require 'test/unit'
-gem 'mocha', '>= 0.9.5'
-require 'mocha'
-
require 'active_support'
require 'active_support/test_case'

0 comments on commit 7583a24

Please sign in to comment.