aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/Rakefile
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2008-02-16 03:08:05 +0000
committerMichael Koziarski <michael@koziarski.com>2008-02-16 03:08:05 +0000
commit1d5ea1857fc0be912b89c4c5032733163da5b31b (patch)
treeee73fcf9286bad2eed14183474911f436c2054c6 /actionpack/Rakefile
parent86cb0a61fb8e07388fdc026530ce113e93f5272d (diff)
downloadrails-1d5ea1857fc0be912b89c4c5032733163da5b31b.tar.gz
rails-1d5ea1857fc0be912b89c4c5032733163da5b31b.tar.bz2
rails-1d5ea1857fc0be912b89c4c5032733163da5b31b.zip
Sort files to test to make load order platform independent. Fix the clash this exposes. Closees #11081 [tpope]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8880 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/Rakefile')
-rw-r--r--actionpack/Rakefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 2bf28ff927..eab3d153cd 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -26,9 +26,9 @@ task :test => [:test_action_pack, :test_active_record_integration]
Rake::TestTask.new(:test_action_pack) { |t|
t.libs << "test"
-# make sure we include the controller tests (c*) first as on some systems
+# 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=Dir.glob( "test/c*/**/*_test.rb" ) + Dir.glob( "test/[ft]*/*_test.rb" )
+ t.test_files=Dir.glob( "test/[cft]*/**/*_test.rb" ).sort
# t.pattern = 'test/*/*_test.rb'
t.verbose = true
}