diff options
| author | Matthew Draper <matthew@trebex.net> | 2015-03-06 23:02:49 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2015-03-06 23:02:49 +1030 |
| commit | c96cb66351267607d8a343575ab6dded0c41dfb5 (patch) | |
| tree | a54d26427d1ab9b63c5de57b00b00496bcf02f84 /activerecord | |
| parent | deed34d8bd2712f680055f398d9f2d22bf710115 (diff) | |
| parent | e46202139647b458b8c3d5eb3a0dff29474159d3 (diff) | |
| download | rails-c96cb66351267607d8a343575ab6dded0c41dfb5.tar.gz rails-c96cb66351267607d8a343575ab6dded0c41dfb5.tar.bz2 rails-c96cb66351267607d8a343575ab6dded0c41dfb5.zip | |
Merge pull request #19221 from matthewd/random-tests
Run all our tests in random order
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/Rakefile | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/helper.rb | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/activerecord/Rakefile b/activerecord/Rakefile index 976b559da9..f1facac21b 100644 --- a/activerecord/Rakefile +++ b/activerecord/Rakefile @@ -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 diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb index f2ba28a32f..b118ecc125 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -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 |