diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-19 17:35:12 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-19 17:35:12 -0300 |
| commit | fd6aaaa0c308b36df3bf06eb87b9eebfca1de127 (patch) | |
| tree | 2a9d1ae1a381a18f09be544f891a0c267bc83aa9 /actionpack/test | |
| parent | fcc2231a04a4911c4cccc05592d100bc280e142a (diff) | |
| download | rails-fd6aaaa0c308b36df3bf06eb87b9eebfca1de127.tar.gz rails-fd6aaaa0c308b36df3bf06eb87b9eebfca1de127.tar.bz2 rails-fd6aaaa0c308b36df3bf06eb87b9eebfca1de127.zip | |
Stop requiring mocha automatically
We are planning to remove mocha from our test suite because of
performance problems. To make this possible we should stop require mocha
on ActionSupport::TestCase.
This should not affect applications since users still need to add mocha
to Gemfile and this already load mocha.
Added FIXME notes to place that still need mocha removal
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 6584d20840..3fe94452b5 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -359,3 +359,5 @@ end def jruby_skip(message = '') skip message if defined?(JRUBY_VERSION) end + +require 'mocha/setup' # FIXME: stop using mocha |