diff options
| author | Matthew Draper <matthew@trebex.net> | 2015-03-06 04:38:54 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2015-03-06 04:38:54 +1030 |
| commit | b5eb0b6cc3d01255b0f04092eee6046ce0b68dba (patch) | |
| tree | 400c914ab3ba17c93c9e10fd682834a9f8b32d2a /actionview/test | |
| parent | f18b5fe9b1a57d0ec0a3631000fce168b33e1e54 (diff) | |
| download | rails-b5eb0b6cc3d01255b0f04092eee6046ce0b68dba.tar.gz rails-b5eb0b6cc3d01255b0f04092eee6046ce0b68dba.tar.bz2 rails-b5eb0b6cc3d01255b0f04092eee6046ce0b68dba.zip | |
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
Diffstat (limited to 'actionview/test')
| -rw-r--r-- | actionview/test/abstract_unit.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb index fc1ca9efdf..3eded74f1b 100644 --- a/actionview/test/abstract_unit.rb +++ b/actionview/test/abstract_unit.rb @@ -338,8 +338,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 |