From 762d7616738a5f922d864d60dee89c44320d8786 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sat, 19 Sep 2009 13:26:54 -0500 Subject: [PATCH] All tests should be ran under isolated_test too --- actionpack/Rakefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/actionpack/Rakefile b/actionpack/Rakefile index 113118bfc9..cc7b4b0043 100644 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -34,22 +34,22 @@ end desc "Run all unit tests" task :test => [:test_action_pack, :test_active_record_integration] +TESTS_GLOB = "test/{abstract,controller,dispatch,new_base,template,html-scanner}/**/*_test.rb" + Rake::TestTask.new(:test_action_pack) do |t| t.libs << 'test' # 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/{abstract,controller,dispatch,new_base,template,html-scanner}/**/*_test.rb" ).sort + t.test_files = Dir.glob(TESTS_GLOB).sort t.verbose = true - #t.warning = true + # t.warning = true end task :isolated_test do ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME')) - Dir.glob("test/{controller,dispatch,template}/**/*_test.rb").all? do |file| - system(ruby, "-Itest", file) - end or raise "Failures" + Dir.glob(TESTS_GLOB).all? { |file| system(ruby, '-Ilib:test', file) } or raise "Failures" end desc 'ActiveRecord Integration Tests'