diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-07-01 11:53:17 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-07-01 11:53:17 -0700 |
| commit | 7583a24ee0ea85d55a5e235c3082f1b67d3d7694 (patch) | |
| tree | 814d6d021d42050417e2bdcc4c77f3bd0dff74e0 /activesupport/lib/active_support/test_case.rb | |
| parent | 0515256fd32e6efb67fe90aedf0dadc25dc9e1ba (diff) | |
| download | rails-7583a24ee0ea85d55a5e235c3082f1b67d3d7694.tar.gz rails-7583a24ee0ea85d55a5e235c3082f1b67d3d7694.tar.bz2 rails-7583a24ee0ea85d55a5e235c3082f1b67d3d7694.zip | |
Move mocha down below initial T::U require and bump version to 0.9.7 [#2858 state:resolved]
Diffstat (limited to 'activesupport/lib/active_support/test_case.rb')
| -rw-r--r-- | activesupport/lib/active_support/test_case.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb index e99a4854ce..d5282bad6a 100644 --- a/activesupport/lib/active_support/test_case.rb +++ b/activesupport/lib/active_support/test_case.rb @@ -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/declarative' 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 |