From b5eb0b6cc3d01255b0f04092eee6046ce0b68dba Mon Sep 17 00:00:00 2001 From: Matthew Draper Date: Fri, 6 Mar 2015 04:38:54 +1030 Subject: Revert "Leave all our tests as order_dependent! for now" This reverts commit 2f52f969885b2834198de0045748436a4651a94e. Conflicts: actionmailer/test/abstract_unit.rb actionview/test/abstract_unit.rb activemodel/test/cases/helper.rb activerecord/test/cases/helper.rb activesupport/test/abstract_unit.rb railties/test/abstract_unit.rb --- actionmailer/test/abstract_unit.rb | 5 ----- 1 file changed, 5 deletions(-) (limited to 'actionmailer/test/abstract_unit.rb') diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index c4d5cb8c33..ae91903c95 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -42,8 +42,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.test_order = :sorted -- cgit v1.2.3