aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/abstract_unit.rb2
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