From dbed69249f477242dae1ff1aad9b6cc61d7886d1 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 5 Jan 2008 13:33:00 +0000
Subject: require abstract_unit directly since test is in load path

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8568 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 railties/test/boot_test.rb                  | 2 +-
 railties/test/console_app_test.rb           | 2 +-
 railties/test/fcgi_dispatcher_test.rb       | 2 +-
 railties/test/initializer_test.rb           | 2 +-
 railties/test/plugin_loader_test.rb         | 4 ++--
 railties/test/plugin_locator_test.rb        | 4 ++--
 railties/test/plugin_test.rb                | 4 ++--
 railties/test/rails_info_controller_test.rb | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'railties')

diff --git a/railties/test/boot_test.rb b/railties/test/boot_test.rb
index 0754777dd6..7736a8f4c0 100644
--- a/railties/test/boot_test.rb
+++ b/railties/test/boot_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+require 'abstract_unit'
 require 'initializer'
 require "#{File.dirname(__FILE__)}/../environments/boot"
 
diff --git a/railties/test/console_app_test.rb b/railties/test/console_app_test.rb
index ac499e0f15..7615d95498 100644
--- a/railties/test/console_app_test.rb
+++ b/railties/test/console_app_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/abstract_unit'
+require 'abstract_unit'
 
 require 'action_controller' # console_app uses 'action_controller/integration'
 
diff --git a/railties/test/fcgi_dispatcher_test.rb b/railties/test/fcgi_dispatcher_test.rb
index 7949cb6525..7e84402a21 100644
--- a/railties/test/fcgi_dispatcher_test.rb
+++ b/railties/test/fcgi_dispatcher_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/abstract_unit"
+require 'abstract_unit'
 
 uses_mocha 'fcgi dispatcher tests' do
 
diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb
index 156f670e87..3a49b2ddb4 100644
--- a/railties/test/initializer_test.rb
+++ b/railties/test/initializer_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+require 'abstract_unit'
 require 'initializer'
 
 class ConfigurationMock < Rails::Configuration
diff --git a/railties/test/plugin_loader_test.rb b/railties/test/plugin_loader_test.rb
index fe77de4474..ec420784a3 100644
--- a/railties/test/plugin_loader_test.rb
+++ b/railties/test/plugin_loader_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/plugin_test_helper'
+require 'plugin_test_helper'
 
 uses_mocha "Plugin Loader Tests" do
 
@@ -137,4 +137,4 @@ uses_mocha "Plugin Loader Tests" do
       end
   end
     
-end
\ No newline at end of file
+end
diff --git a/railties/test/plugin_locator_test.rb b/railties/test/plugin_locator_test.rb
index ccd270dd10..46b386d59d 100644
--- a/railties/test/plugin_locator_test.rb
+++ b/railties/test/plugin_locator_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/plugin_test_helper'
+require 'plugin_test_helper'
 
 uses_mocha "Plugin Locator Tests" do
 
@@ -66,4 +66,4 @@ uses_mocha "Plugin Locator Tests" do
     end
   end
 
-end # uses_mocha
\ No newline at end of file
+end # uses_mocha
diff --git a/railties/test/plugin_test.rb b/railties/test/plugin_test.rb
index 0f08c314db..32c72f1b31 100644
--- a/railties/test/plugin_test.rb
+++ b/railties/test/plugin_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/plugin_test_helper'
+require 'plugin_test_helper'
 
 uses_mocha "Plugin Tests" do
 
@@ -138,4 +138,4 @@ uses_mocha "Plugin Tests" do
       end
   end
 
-end # uses_mocha
\ No newline at end of file
+end # uses_mocha
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index b73ce5a09a..17c7d9deea 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+require 'abstract_unit'
 require 'action_controller'
 require 'action_controller/test_process'
 
-- 
cgit v1.2.3