diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-12 20:29:15 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-13 09:24:43 -0200 |
| commit | 17ccefc4360caea1a80eada324513dc6cb809c75 (patch) | |
| tree | b7741b29488087d2abb4ab75b667b113b978ab6d /activesupport | |
| parent | 25b23d7ecc3a6c339fb580bd94dc5830ceb71b6f (diff) | |
| download | rails-17ccefc4360caea1a80eada324513dc6cb809c75.tar.gz rails-17ccefc4360caea1a80eada324513dc6cb809c75.tar.bz2 rails-17ccefc4360caea1a80eada324513dc6cb809c75.zip | |
Update mocha version to 0.13.0 and change requires
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/testing/mochaing.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/testing/setup_and_teardown.rb | 1 | ||||
| -rw-r--r-- | activesupport/test/abstract_unit.rb | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/testing/mochaing.rb b/activesupport/lib/active_support/testing/mochaing.rb index 0161476d79..ae4e7e9a1f 100644 --- a/activesupport/lib/active_support/testing/mochaing.rb +++ b/activesupport/lib/active_support/testing/mochaing.rb @@ -4,4 +4,4 @@ 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
\ No newline at end of file +end diff --git a/activesupport/lib/active_support/testing/setup_and_teardown.rb b/activesupport/lib/active_support/testing/setup_and_teardown.rb index d21511d4db..e5353f65cf 100644 --- a/activesupport/lib/active_support/testing/setup_and_teardown.rb +++ b/activesupport/lib/active_support/testing/setup_and_teardown.rb @@ -116,7 +116,6 @@ module ActiveSupport end end end - end end end diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb index 0382739871..c26a48a490 100644 --- a/activesupport/test/abstract_unit.rb +++ b/activesupport/test/abstract_unit.rb @@ -25,7 +25,7 @@ end require 'test/unit' require 'empty_bool' -silence_warnings { require 'mocha' } +silence_warnings { require 'mocha/setup' } ENV['NO_RELOAD'] = '1' require 'active_support' |