From 88cf64a6690e3c7cc05bd644bd5ad9a000192ebd Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 5 Apr 2013 16:38:37 -0700 Subject: extract test info from the command line and set up the test task --- railties/lib/rails/test_unit/testing.rake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'railties/lib/rails') diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake index bef819a8a8..9a3094b1b7 100644 --- a/railties/lib/rails/test_unit/testing.rake +++ b/railties/lib/rails/test_unit/testing.rake @@ -48,12 +48,14 @@ task default: :test desc 'Runs test:units, test:functionals, test:integration together' task :test do - tasks = Rake.application.top_level_tasks - test_files = tasks.grep(/^test\//) - if test_files.any? + info = Rails::TestTask.test_info Rake.application.top_level_tasks + if info.files.any? Rails::TestTask.new('test:single') { |t| - t.test_files = test_files + t.test_files = info.files } + ENV['TESTOPTS'] ||= info.opts + Rake.application.top_level_tasks.replace info.tasks + Rake::Task['test:single'].invoke else Rake::Task[ENV['TEST'] ? 'test:single' : 'test:run'].invoke -- cgit v1.2.3