1 files changed, 6 insertions, 9 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index f858d10ae8..7eab972595 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -1,20 +1,18 @@
 require 'rake/testtask'
 require 'rubygems/package_task'
 
+test_files = Dir.glob('test/{abstract,controller,dispatch,assertions,journey,routing}/**/*_test.rb')
+
 desc "Default Task"
 task :default => :test
 
 # Run the unit tests
-
-desc "Run all unit tests"
-task :test => [:test_action_pack]
-
-Rake::TestTask.new(:test_action_pack) do |t|
+Rake::TestTask.new 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,assertions,journey}/**/*_test.rb').sort
+  t.test_files = test_files.sort
 
   t.warning = true
   t.verbose = true
@@ -22,9 +20,8 @@ end
 
 namespace :test do
   task :isolated do
-    ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
-    Dir.glob("test/{abstract,controller,dispatch}/**/*_test.rb").all? do |file|
-      sh(ruby, '-Ilib:test', file)
+    test_files.all? do |file|
+      sh(Gem.ruby, '-w', '-Ilib:test', file)
     end or raise "Failures"
   end
 end