From 3a161e65e76a83be6d62c424227fe10b5b66b77d Mon Sep 17 00:00:00 2001 From: Marcin Olichwirowicz Date: Fri, 21 Aug 2015 22:33:50 +0200 Subject: Get rid of mocha tests - part 1 --- actionpack/test/abstract_unit.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'actionpack/test/abstract_unit.rb') diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 60e2cea8a2..8c61d6a25e 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -397,6 +397,7 @@ def jruby_skip(message = '') end require 'mocha/setup' # FIXME: stop using mocha +require 'minitest/mock' class ForkingExecutor class Server -- cgit v1.2.3