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 /actionpack | |
| 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 'actionpack')
| -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 0f7b3a08e1..b07d8a7be0 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -438,6 +438,8 @@ def jruby_skip(message = '') skip message if defined?(JRUBY_VERSION) end +require 'mocha/setup' # FIXME: stop using mocha + class ForkingExecutor class Server include DRb::DRbUndumped |