mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Revert "Leave all our tests as order_dependent! for now"
This reverts commit 2f52f96988
.
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
This commit is contained in:
parent
f18b5fe9b1
commit
b5eb0b6cc3
6 changed files with 0 additions and 30 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -22,8 +22,3 @@ end
|
|||
def jruby_skip(message = '')
|
||||
skip message if defined?(JRUBY_VERSION)
|
||||
end
|
||||
|
||||
# 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
|
||||
|
|
|
@ -203,8 +203,3 @@ module InTimeZone
|
|||
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
|
||||
|
|
|
@ -38,8 +38,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
|
||||
|
|
|
@ -30,9 +30,4 @@ end
|
|||
|
||||
class ActiveSupport::TestCase
|
||||
include ActiveSupport::Testing::Stream
|
||||
|
||||
# FIXME: we have tests that depend on run order, we should fix that and
|
||||
# remove this method call.
|
||||
self.test_order = :sorted
|
||||
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue