aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/abstract_unit.rb
diff options
context:
space:
mode:
authorMarcin Olichwirowicz <olichwirowicz@gmail.com>2015-09-05 16:58:21 +0200
committerMarcin Olichwirowicz <olichwirowicz@gmail.com>2015-09-05 16:58:40 +0200
commit81bc771e7cccb8a43f067a89f721f83798e63483 (patch)
tree2ab0d3b2b2530ad296c34cc57df66c715ee7be0b /actionpack/test/abstract_unit.rb
parenta8f4568f5396b68ae81eddc636604bb78bb6632a (diff)
downloadrails-81bc771e7cccb8a43f067a89f721f83798e63483.tar.gz
rails-81bc771e7cccb8a43f067a89f721f83798e63483.tar.bz2
rails-81bc771e7cccb8a43f067a89f721f83798e63483.zip
Remove mocha from ActionPack tests
Diffstat (limited to 'actionpack/test/abstract_unit.rb')
-rw-r--r--actionpack/test/abstract_unit.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 1954324222..3c498960e4 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -406,7 +406,6 @@ def jruby_skip(message = '')
skip message if defined?(JRUBY_VERSION)
end
-require 'mocha/setup' # FIXME: stop using mocha
require 'active_support/testing/method_call_assertions'
class ForkingExecutor