aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test/abstract_unit.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafael.franca@plataformatec.com.br>2014-08-17 22:38:22 -0300
committerRafael Mendonça França <rafael.franca@plataformatec.com.br>2014-08-17 22:38:22 -0300
commitc78da4d5c472f7254ed609ef753d7b1719732802 (patch)
treef04630ac62d08a49744b90bdf20bf75dcb883838 /actionmailer/test/abstract_unit.rb
parent4e4913462104df89f1bee08faeb4ba5aab8c9228 (diff)
parent7ee055076ec2c5b2e9c110f821c10fe06bf38a1c (diff)
downloadrails-c78da4d5c472f7254ed609ef753d7b1719732802.tar.gz
rails-c78da4d5c472f7254ed609ef753d7b1719732802.tar.bz2
rails-c78da4d5c472f7254ed609ef753d7b1719732802.zip
Merge branch 'master' into loofah
Conflicts: actionpack/CHANGELOG.md
Diffstat (limited to 'actionmailer/test/abstract_unit.rb')
-rw-r--r--actionmailer/test/abstract_unit.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index 28727b62ec..c549545674 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -51,8 +51,3 @@ def jruby_skip(message = '')
end
require 'mocha/setup' # FIXME: stop using mocha
-
-# FIXME: we have tests that depend on run order, we should fix that and
-# remove this method call.
-require 'active_support/test_case'
-ActiveSupport::TestCase.my_tests_are_order_dependent!