require abstract_unit directly since test is in load path

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8569 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

4 files changed, 4 insertions, 4 deletions

diff --git a/railties/Rakefile b/railties/Rakefile
index 3a263d566e..df87cd61a6 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -28,7 +28,7 @@ task :default => :test
 ## we can see the failures
 task :test do 
   Dir['test/**/*_test.rb'].all? do |file|
-    system("ruby #{file}")
+    system("ruby -Itest #{file}")
   end or raise "Failures"
 end
 
diff --git a/railties/test/generators/rails_model_generator_test.rb b/railties/test/generators/rails_model_generator_test.rb
index a1637c4cda..58d1f53ebb 100644
--- a/railties/test/generators/rails_model_generator_test.rb
+++ b/railties/test/generators/rails_model_generator_test.rb
@@ -50,7 +50,7 @@ Dir.mkdir(RAILS_ROOT) unless File.exist?(RAILS_ROOT)
 
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib"
 require 'rails_generator'
-require "#{File.dirname(__FILE__)}/generator_test_helper"
+require 'generators/generator_test_helper'
 
 class RailsModelGeneratorTest < Test::Unit::TestCase
   include GeneratorTestHelper
diff --git a/railties/test/generators/rails_resource_generator_test.rb b/railties/test/generators/rails_resource_generator_test.rb
index 63cd284d35..bec003dc4c 100644
--- a/railties/test/generators/rails_resource_generator_test.rb
+++ b/railties/test/generators/rails_resource_generator_test.rb
@@ -50,7 +50,7 @@ Dir.mkdir(RAILS_ROOT) unless File.exist?(RAILS_ROOT)
 
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib"
 require 'rails_generator'
-require "#{File.dirname(__FILE__)}/generator_test_helper"
+require 'generators/generator_test_helper'
 
 class RailsResourceGeneratorTest < Test::Unit::TestCase
   include GeneratorTestHelper
diff --git a/railties/test/generators/rails_scaffold_generator_test.rb b/railties/test/generators/rails_scaffold_generator_test.rb
index 16588affab..f25ca74ed4 100644
--- a/railties/test/generators/rails_scaffold_generator_test.rb
+++ b/railties/test/generators/rails_scaffold_generator_test.rb
@@ -52,7 +52,7 @@ Dir.mkdir(RAILS_ROOT) unless File.exist?(RAILS_ROOT)
 
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib"
 require 'rails_generator'
-require "#{File.dirname(__FILE__)}/generator_test_helper"
+require 'generators/generator_test_helper'
 
 class RailsScaffoldGeneratorTest < Test::Unit::TestCase