diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-19 18:17:13 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-19 18:17:13 -0300 |
| commit | 08754f12e65a9ec79633a605e986d0f1ffa4b251 (patch) | |
| tree | 19afe9d285cc9169d68de7ea850625833c7bb09c /activesupport | |
| parent | 0533893df59a11e5c80a9a64d6db018aa46b3459 (diff) | |
| parent | fd6aaaa0c308b36df3bf06eb87b9eebfca1de127 (diff) | |
| download | rails-08754f12e65a9ec79633a605e986d0f1ffa4b251.tar.gz rails-08754f12e65a9ec79633a605e986d0f1ffa4b251.tar.bz2 rails-08754f12e65a9ec79633a605e986d0f1ffa4b251.zip | |
Merge branch 'rm-remove-mocha'
Conflicts:
actionpack/test/abstract_unit.rb
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/test_case.rb | 5 | ||||
| -rw-r--r-- | activesupport/test/abstract_unit.rb | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb index e6c125bfdd..751fdaef78 100644 --- a/activesupport/lib/active_support/test_case.rb +++ b/activesupport/lib/active_support/test_case.rb @@ -9,11 +9,6 @@ require 'active_support/testing/time_helpers' require 'active_support/core_ext/kernel/reporting' require 'active_support/deprecation' -begin - silence_warnings { require 'mocha/setup' } -rescue LoadError -end - module ActiveSupport class TestCase < ::Minitest::Test Assertion = Minitest::Assertion diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb index 0b393e0c7a..7ffcae6007 100644 --- a/activesupport/test/abstract_unit.rb +++ b/activesupport/test/abstract_unit.rb @@ -36,3 +36,5 @@ end def jruby_skip(message = '') skip message if defined?(JRUBY_VERSION) end + +require 'mocha/setup' # FIXME: stop using mocha |