diff options
| author | ecoologic <erikecoologic@gmail.com> | 2014-10-07 23:17:56 +1000 |
|---|---|---|
| committer | ecoologic <erikecoologic@gmail.com> | 2014-10-07 23:17:56 +1000 |
| commit | 117f09c5d1eb600908001bb7b5ee353756e56456 (patch) | |
| tree | 717d45020cf652840f90c09579692e30bf31237b /actionpack/Rakefile | |
| parent | 8caf16a281260fedb0677c85047469e99c48da94 (diff) | |
| parent | 75780373af9a3ddd4cc1bda3d4dbfe6121102b2e (diff) | |
| download | rails-117f09c5d1eb600908001bb7b5ee353756e56456.tar.gz rails-117f09c5d1eb600908001bb7b5ee353756e56456.tar.bz2 rails-117f09c5d1eb600908001bb7b5ee353756e56456.zip | |
Merge remote-tracking branch 'origin/master' into guides-template-inheritance
Diffstat (limited to 'actionpack/Rakefile')
| -rw-r--r-- | actionpack/Rakefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile index cf20751687..af075f82ad 100644 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -9,7 +9,10 @@ task :default => :test # Run the unit tests Rake::TestTask.new do |t| t.libs << 'test' - t.test_files = test_files + + # 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.warning = true t.verbose = true |