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 e10305f commit a8bd3c8a109fe88a4ce567e4272fd796e42b42da 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"
@@ -5,8 +5,7 @@
require 'rubygems'
require 'test/unit'
-gem 'mocha', '>= 0.9.5'
-require 'mocha'
+require 'stringio'
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"
$:.unshift "#{File.dirname(__FILE__)}/../../activesupport/lib"
@@ -1,3 +1,5 @@
+require "active_support/core_ext/array"
+
# Extends the module object with module and instance accessors for class attributes,
# just like the native attr* accessors for instance attributes.
#
@@ -1,18 +1,18 @@
+require 'test/unit/testcase'
+require 'active_support/testing/setup_and_teardown'
+require 'active_support/testing/assertions'
+require 'active_support/testing/deprecation'
+require 'active_support/testing/declarative'
+
begin
- gem 'mocha', '>= 0.9.3'
+ 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
-require 'test/unit/testcase'
-require 'active_support/testing/setup_and_teardown'
-require 'active_support/testing/assertions'
-require 'active_support/testing/deprecation'
-require 'active_support/testing/declarative'
-
module ActiveSupport
class TestCase < ::Test::Unit::TestCase
if defined? MiniTest
@@ -1,3 +1,5 @@
+require "active_support/core_ext/module"
+
module ActiveSupport
module Testing
module Deprecation #:nodoc:
@@ -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'
@@ -1,8 +1,7 @@
require 'rubygems'
require 'test/unit'
-gem 'mocha', '>= 0.9.5'
-require 'mocha'
+ENV['NO_RELOAD'] = '1'
$:.unshift "#{File.dirname(__FILE__)}/../lib"
require 'active_support'
@@ -9,9 +9,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 a8bd3c8

Please sign in to comment.