mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #19221 from matthewd/random-tests
Run all our tests in random order
This commit is contained in:
commit
c96cb66351
10 changed files with 4 additions and 37 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
|
||||
|
|
|
@ -9,10 +9,7 @@ task :default => :test
|
|||
# Run the unit tests
|
||||
Rake::TestTask.new do |t|
|
||||
t.libs << 'test'
|
||||
|
||||
# make sure we include the tests in alphabetical order as on some systems
|
||||
# this will not happen automatically and the tests (as a whole) will error
|
||||
t.test_files = test_files.sort
|
||||
t.test_files = test_files
|
||||
|
||||
t.warning = true
|
||||
t.verbose = true
|
||||
|
|
|
@ -18,7 +18,7 @@ namespace :test do
|
|||
|
||||
Rake::TestTask.new(:template) do |t|
|
||||
t.libs << 'test'
|
||||
t.test_files = Dir.glob('test/template/**/*_test.rb').sort
|
||||
t.test_files = Dir.glob('test/template/**/*_test.rb')
|
||||
t.warning = true
|
||||
t.verbose = true
|
||||
t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -6,7 +6,7 @@ task :default => :test
|
|||
|
||||
Rake::TestTask.new do |t|
|
||||
t.libs << "test"
|
||||
t.test_files = Dir.glob("#{dir}/test/cases/**/*_test.rb").sort
|
||||
t.test_files = Dir.glob("#{dir}/test/cases/**/*_test.rb")
|
||||
t.warning = true
|
||||
t.verbose = true
|
||||
t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -51,7 +51,7 @@ end
|
|||
t.libs << 'test'
|
||||
t.test_files = (Dir.glob( "test/cases/**/*_test.rb" ).reject {
|
||||
|x| x =~ /\/adapters\//
|
||||
} + Dir.glob("test/cases/adapters/#{adapter_short}/**/*_test.rb")).sort
|
||||
} + Dir.glob("test/cases/adapters/#{adapter_short}/**/*_test.rb"))
|
||||
|
||||
t.warning = true
|
||||
t.verbose = true
|
||||
|
|
|
@ -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