aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-07-19 17:35:12 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-07-19 17:35:12 -0300
commitfd6aaaa0c308b36df3bf06eb87b9eebfca1de127 (patch)
tree2a9d1ae1a381a18f09be544f891a0c267bc83aa9 /actionmailer/test
parentfcc2231a04a4911c4cccc05592d100bc280e142a (diff)
downloadrails-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 'actionmailer/test')
-rw-r--r--actionmailer/test/abstract_unit.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index 93aae2807e..98d266bd73 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -49,3 +49,5 @@ end
def jruby_skip(message = '')
skip message if defined?(JRUBY_VERSION)
end
+
+require 'mocha/setup' # FIXME: stop using mocha