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 /actionview | |
| 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 'actionview')
| -rw-r--r-- | actionview/Rakefile | 2 | ||||
| -rw-r--r-- | actionview/test/abstract_unit.rb | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/actionview/Rakefile b/actionview/Rakefile index 1b71435948..2b752b83df 100644 --- a/actionview/Rakefile +++ b/actionview/Rakefile @@ -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) 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 |