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

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8563 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 activesupport/test/buffered_logger_test.rb                            | 2 +-
 activesupport/test/caching_test.rb                                    | 2 +-
 activesupport/test/clean_logger_test.rb                               | 2 +-
 activesupport/test/core_ext/array_ext_test.rb                         | 2 +-
 activesupport/test/core_ext/blank_test.rb                             | 2 +-
 activesupport/test/core_ext/cgi_ext_test.rb                           | 2 +-
 activesupport/test/core_ext/class/attribute_accessor_test.rb          | 4 ++--
 .../test/core_ext/class/class_inheritable_attributes_test.rb          | 2 +-
 activesupport/test/core_ext/class/delegating_attributes_test.rb       | 4 ++--
 activesupport/test/core_ext/class_test.rb                             | 2 +-
 activesupport/test/core_ext/date_ext_test.rb                          | 2 +-
 activesupport/test/core_ext/date_time_ext_test.rb                     | 2 +-
 activesupport/test/core_ext/duplicable_test.rb                        | 2 +-
 activesupport/test/core_ext/duration_test.rb                          | 2 +-
 activesupport/test/core_ext/enumerable_test.rb                        | 2 +-
 activesupport/test/core_ext/exception_test.rb                         | 2 +-
 activesupport/test/core_ext/file_test.rb                              | 2 +-
 activesupport/test/core_ext/float_ext_test.rb                         | 2 +-
 activesupport/test/core_ext/hash_ext_test.rb                          | 2 +-
 activesupport/test/core_ext/integer_ext_test.rb                       | 2 +-
 activesupport/test/core_ext/kernel_test.rb                            | 2 +-
 activesupport/test/core_ext/module/attr_accessor_with_default_test.rb | 4 ++--
 activesupport/test/core_ext/module/attr_internal_test.rb              | 2 +-
 activesupport/test/core_ext/module/attribute_accessor_test.rb         | 2 +-
 activesupport/test/core_ext/module/attribute_aliasing_test.rb         | 2 +-
 activesupport/test/core_ext/module_test.rb                            | 2 +-
 activesupport/test/core_ext/name_error_test.rb                        | 2 +-
 activesupport/test/core_ext/numeric_ext_test.rb                       | 2 +-
 activesupport/test/core_ext/object_and_class_ext_test.rb              | 2 +-
 activesupport/test/core_ext/pathname_test.rb                          | 2 +-
 activesupport/test/core_ext/proc_test.rb                              | 2 +-
 activesupport/test/core_ext/range_ext_test.rb                         | 2 +-
 activesupport/test/core_ext/string_ext_test.rb                        | 2 +-
 activesupport/test/core_ext/symbol_test.rb                            | 2 +-
 activesupport/test/core_ext/time_ext_test.rb                          | 2 +-
 activesupport/test/dependencies_test.rb                               | 2 +-
 activesupport/test/deprecation_test.rb                                | 2 +-
 activesupport/test/inflector_test.rb                                  | 2 +-
 activesupport/test/json/decoding_test.rb                              | 2 +-
 activesupport/test/json/encoding_test.rb                              | 2 +-
 activesupport/test/option_merger_test.rb                              | 2 +-
 activesupport/test/ordered_options_test.rb                            | 2 +-
 activesupport/test/test_test.rb                                       | 3 ++-
 activesupport/test/time_zone_test.rb                                  | 2 +-
 activesupport/test/whiny_nil_test.rb                                  | 2 +-
 45 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/activesupport/test/buffered_logger_test.rb b/activesupport/test/buffered_logger_test.rb
index 5ce197eba8..9fdf078f5d 100644
--- a/activesupport/test/buffered_logger_test.rb
+++ b/activesupport/test/buffered_logger_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/abstract_unit'
+require 'abstract_unit'
 require 'stringio'
 
 class BufferedLoggerTest < Test::Unit::TestCase
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 592eede63e..4694cb11d1 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/abstract_unit'
+require 'abstract_unit'
 
 class CacheStoreSettingTest < Test::Unit::TestCase
   def test_file_fragment_cache_store
diff --git a/activesupport/test/clean_logger_test.rb b/activesupport/test/clean_logger_test.rb
index 5c9c8f9147..269dd2a620 100644
--- a/activesupport/test/clean_logger_test.rb
+++ b/activesupport/test/clean_logger_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/abstract_unit'
+require 'abstract_unit'
 require 'stringio'
 
 class CleanLoggerTest < Test::Unit::TestCase
diff --git a/activesupport/test/core_ext/array_ext_test.rb b/activesupport/test/core_ext/array_ext_test.rb
index 840a4c81d1..ccab0f70d0 100644
--- a/activesupport/test/core_ext/array_ext_test.rb
+++ b/activesupport/test/core_ext/array_ext_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 require 'bigdecimal'
 
 class ArrayExtAccessTests < Test::Unit::TestCase
diff --git a/activesupport/test/core_ext/blank_test.rb b/activesupport/test/core_ext/blank_test.rb
index 27b9813ac4..061d940383 100644
--- a/activesupport/test/core_ext/blank_test.rb
+++ b/activesupport/test/core_ext/blank_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class EmptyTrue
   def empty?() true; end
diff --git a/activesupport/test/core_ext/cgi_ext_test.rb b/activesupport/test/core_ext/cgi_ext_test.rb
index 229715c28e..320efd405f 100644
--- a/activesupport/test/core_ext/cgi_ext_test.rb
+++ b/activesupport/test/core_ext/cgi_ext_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class EscapeSkippingSlashesTest < Test::Unit::TestCase
   def test_array
diff --git a/activesupport/test/core_ext/class/attribute_accessor_test.rb b/activesupport/test/core_ext/class/attribute_accessor_test.rb
index 8104c9ce88..85d0dd89e2 100644
--- a/activesupport/test/core_ext/class/attribute_accessor_test.rb
+++ b/activesupport/test/core_ext/class/attribute_accessor_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../abstract_unit'
+require 'abstract_unit'
 
 class ClassAttributeAccessorTest < Test::Unit::TestCase
   def setup
@@ -28,4 +28,4 @@ class ClassAttributeAccessorTest < Test::Unit::TestCase
     assert @object.respond_to?(:bar)
     assert !@object.respond_to?(:bar=)
   end
-end
\ No newline at end of file
+end
diff --git a/activesupport/test/core_ext/class/class_inheritable_attributes_test.rb b/activesupport/test/core_ext/class/class_inheritable_attributes_test.rb
index c0bb7acb3d..7f859772e7 100644
--- a/activesupport/test/core_ext/class/class_inheritable_attributes_test.rb
+++ b/activesupport/test/core_ext/class/class_inheritable_attributes_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../abstract_unit'
+require 'abstract_unit'
 
 class ClassInheritableAttributesTest < Test::Unit::TestCase
   def setup
diff --git a/activesupport/test/core_ext/class/delegating_attributes_test.rb b/activesupport/test/core_ext/class/delegating_attributes_test.rb
index f5b14364cf..fa605e6d19 100644
--- a/activesupport/test/core_ext/class/delegating_attributes_test.rb
+++ b/activesupport/test/core_ext/class/delegating_attributes_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../abstract_unit'
+require 'abstract_unit'
 
 module DelegatingFixtures
   class Parent
@@ -102,4 +102,4 @@ class DelegatingAttributesTest < Test::Unit::TestCase
     assert_nil Mokopuna.some_attribute
   end
 
-end
\ No newline at end of file
+end
diff --git a/activesupport/test/core_ext/class_test.rb b/activesupport/test/core_ext/class_test.rb
index e1b38a1e07..0346fad190 100644
--- a/activesupport/test/core_ext/class_test.rb
+++ b/activesupport/test/core_ext/class_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class A
 end
diff --git a/activesupport/test/core_ext/date_ext_test.rb b/activesupport/test/core_ext/date_ext_test.rb
index 0023d48c1a..483841a129 100644
--- a/activesupport/test/core_ext/date_ext_test.rb
+++ b/activesupport/test/core_ext/date_ext_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class DateExtCalculationsTest < Test::Unit::TestCase
   def test_to_s
diff --git a/activesupport/test/core_ext/date_time_ext_test.rb b/activesupport/test/core_ext/date_time_ext_test.rb
index 57697871f5..4fa1b5aafd 100644
--- a/activesupport/test/core_ext/date_time_ext_test.rb
+++ b/activesupport/test/core_ext/date_time_ext_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class DateTimeExtCalculationsTest < Test::Unit::TestCase
   def test_to_s
diff --git a/activesupport/test/core_ext/duplicable_test.rb b/activesupport/test/core_ext/duplicable_test.rb
index 5e34184a46..3ccfedccd7 100644
--- a/activesupport/test/core_ext/duplicable_test.rb
+++ b/activesupport/test/core_ext/duplicable_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class DuplicableTest < Test::Unit::TestCase
   NO  = [nil, false, true, :symbol, 1, 2.3, BigDecimal.new('4.56')]
diff --git a/activesupport/test/core_ext/duration_test.rb b/activesupport/test/core_ext/duration_test.rb
index 2a86a7b1e7..df878f917b 100644
--- a/activesupport/test/core_ext/duration_test.rb
+++ b/activesupport/test/core_ext/duration_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class DurationTest < Test::Unit::TestCase
   def test_inspect
diff --git a/activesupport/test/core_ext/enumerable_test.rb b/activesupport/test/core_ext/enumerable_test.rb
index af183dace3..97e3ff6377 100644
--- a/activesupport/test/core_ext/enumerable_test.rb
+++ b/activesupport/test/core_ext/enumerable_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 Payment = Struct.new(:price)
 class SummablePayment < Payment
diff --git a/activesupport/test/core_ext/exception_test.rb b/activesupport/test/core_ext/exception_test.rb
index 6a60c91380..dabd8c7c06 100644
--- a/activesupport/test/core_ext/exception_test.rb
+++ b/activesupport/test/core_ext/exception_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class ExceptionExtTests < Test::Unit::TestCase
 
diff --git a/activesupport/test/core_ext/file_test.rb b/activesupport/test/core_ext/file_test.rb
index 1102538876..5efe357e9f 100644
--- a/activesupport/test/core_ext/file_test.rb
+++ b/activesupport/test/core_ext/file_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class AtomicWriteTest < Test::Unit::TestCase
   
diff --git a/activesupport/test/core_ext/float_ext_test.rb b/activesupport/test/core_ext/float_ext_test.rb
index b74add519f..d19b5ecf47 100644
--- a/activesupport/test/core_ext/float_ext_test.rb
+++ b/activesupport/test/core_ext/float_ext_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class FloatExtRoundingTests < Test::Unit::TestCase
   def test_round_for_positive_number
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
index a39c32a2e3..65f14d696f 100644
--- a/activesupport/test/core_ext/hash_ext_test.rb
+++ b/activesupport/test/core_ext/hash_ext_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class HashExtTest < Test::Unit::TestCase
   def setup
diff --git a/activesupport/test/core_ext/integer_ext_test.rb b/activesupport/test/core_ext/integer_ext_test.rb
index 6d6b796865..5ab36226a1 100644
--- a/activesupport/test/core_ext/integer_ext_test.rb
+++ b/activesupport/test/core_ext/integer_ext_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class IntegerExtTest < Test::Unit::TestCase
   def test_even
diff --git a/activesupport/test/core_ext/kernel_test.rb b/activesupport/test/core_ext/kernel_test.rb
index 92d9047061..e826ec161d 100644
--- a/activesupport/test/core_ext/kernel_test.rb
+++ b/activesupport/test/core_ext/kernel_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class KernelTest < Test::Unit::TestCase
   def test_silence_warnings
diff --git a/activesupport/test/core_ext/module/attr_accessor_with_default_test.rb b/activesupport/test/core_ext/module/attr_accessor_with_default_test.rb
index 71039c0ef9..7c59348af9 100644
--- a/activesupport/test/core_ext/module/attr_accessor_with_default_test.rb
+++ b/activesupport/test/core_ext/module/attr_accessor_with_default_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../abstract_unit'
+require 'abstract_unit'
 
 class AttrAccessorWithDefaultTest < Test::Unit::TestCase
   def setup
@@ -27,4 +27,4 @@ class AttrAccessorWithDefaultTest < Test::Unit::TestCase
   def test_invalid_args
     assert_raise(RuntimeError) {@target.attr_accessor_with_default :foo}
   end
-end
\ No newline at end of file
+end
diff --git a/activesupport/test/core_ext/module/attr_internal_test.rb b/activesupport/test/core_ext/module/attr_internal_test.rb
index 1bf831e490..52833019e7 100644
--- a/activesupport/test/core_ext/module/attr_internal_test.rb
+++ b/activesupport/test/core_ext/module/attr_internal_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../abstract_unit'
+require 'abstract_unit'
 
 class AttrInternalTest < Test::Unit::TestCase
   def setup
diff --git a/activesupport/test/core_ext/module/attribute_accessor_test.rb b/activesupport/test/core_ext/module/attribute_accessor_test.rb
index 7296cc5f8c..96975085cf 100644
--- a/activesupport/test/core_ext/module/attribute_accessor_test.rb
+++ b/activesupport/test/core_ext/module/attribute_accessor_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../abstract_unit'
+require 'abstract_unit'
 
 class ModuleAttributeAccessorTest < Test::Unit::TestCase
   def setup
diff --git a/activesupport/test/core_ext/module/attribute_aliasing_test.rb b/activesupport/test/core_ext/module/attribute_aliasing_test.rb
index bd23879513..570ac3b8d5 100644
--- a/activesupport/test/core_ext/module/attribute_aliasing_test.rb
+++ b/activesupport/test/core_ext/module/attribute_aliasing_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../abstract_unit'
+require 'abstract_unit'
 
 module AttributeAliasing
   class Content
diff --git a/activesupport/test/core_ext/module_test.rb b/activesupport/test/core_ext/module_test.rb
index fd1f99b316..ecdea38d44 100644
--- a/activesupport/test/core_ext/module_test.rb
+++ b/activesupport/test/core_ext/module_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 module One
   Constant1 = "Hello World"
diff --git a/activesupport/test/core_ext/name_error_test.rb b/activesupport/test/core_ext/name_error_test.rb
index d038875303..bae004809f 100644
--- a/activesupport/test/core_ext/name_error_test.rb
+++ b/activesupport/test/core_ext/name_error_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class NameErrorTest < Test::Unit::TestCase
   def test_name_error_should_set_missing_name
diff --git a/activesupport/test/core_ext/numeric_ext_test.rb b/activesupport/test/core_ext/numeric_ext_test.rb
index a773339b29..8672229fbb 100644
--- a/activesupport/test/core_ext/numeric_ext_test.rb
+++ b/activesupport/test/core_ext/numeric_ext_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class NumericExtTimeAndDateTimeTest < Test::Unit::TestCase
   def setup
diff --git a/activesupport/test/core_ext/object_and_class_ext_test.rb b/activesupport/test/core_ext/object_and_class_ext_test.rb
index 09a86721dd..16f4ab888e 100644
--- a/activesupport/test/core_ext/object_and_class_ext_test.rb
+++ b/activesupport/test/core_ext/object_and_class_ext_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class ClassA; end
 class ClassB < ClassA; end
diff --git a/activesupport/test/core_ext/pathname_test.rb b/activesupport/test/core_ext/pathname_test.rb
index 2933e2d610..d17e8bb255 100644
--- a/activesupport/test/core_ext/pathname_test.rb
+++ b/activesupport/test/core_ext/pathname_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class TestPathname < Test::Unit::TestCase
   def test_clean_within
diff --git a/activesupport/test/core_ext/proc_test.rb b/activesupport/test/core_ext/proc_test.rb
index f63cd82d22..29f85371de 100644
--- a/activesupport/test/core_ext/proc_test.rb
+++ b/activesupport/test/core_ext/proc_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class ProcTests < Test::Unit::TestCase
   def test_bind_returns_method_with_changed_self
diff --git a/activesupport/test/core_ext/range_ext_test.rb b/activesupport/test/core_ext/range_ext_test.rb
index acb6baf432..38253d4d25 100644
--- a/activesupport/test/core_ext/range_ext_test.rb
+++ b/activesupport/test/core_ext/range_ext_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class RangeTest < Test::Unit::TestCase
   def test_to_s_from_dates
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index 3124d20bac..96c8ed849e 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -1,5 +1,5 @@
 require 'date'
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 require 'inflector_test_cases'
 
 class StringInflectionsTest < Test::Unit::TestCase
diff --git a/activesupport/test/core_ext/symbol_test.rb b/activesupport/test/core_ext/symbol_test.rb
index 943133496a..1eaccb9965 100644
--- a/activesupport/test/core_ext/symbol_test.rb
+++ b/activesupport/test/core_ext/symbol_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class SymbolTests < Test::Unit::TestCase
   def test_to_proc
diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb
index be847a317d..5970411233 100644
--- a/activesupport/test/core_ext/time_ext_test.rb
+++ b/activesupport/test/core_ext/time_ext_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class TimeExtCalculationsTest < Test::Unit::TestCase
   def test_seconds_since_midnight
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index 76f8453c35..67ff193f77 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/abstract_unit'
+require 'abstract_unit'
 require 'pp'
 
 module ModuleWithMissing
diff --git a/activesupport/test/deprecation_test.rb b/activesupport/test/deprecation_test.rb
index 9eb9e9253a..ebfa405947 100644
--- a/activesupport/test/deprecation_test.rb
+++ b/activesupport/test/deprecation_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/abstract_unit'
+require 'abstract_unit'
 
 class Deprecatee
   def initialize
diff --git a/activesupport/test/inflector_test.rb b/activesupport/test/inflector_test.rb
index b0155d36bc..00d8f45028 100644
--- a/activesupport/test/inflector_test.rb
+++ b/activesupport/test/inflector_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/abstract_unit'
+require 'abstract_unit'
 require 'inflector_test_cases'
 
 module Ace
diff --git a/activesupport/test/json/decoding_test.rb b/activesupport/test/json/decoding_test.rb
index 93560fb5a2..19ae3a01a8 100644
--- a/activesupport/test/json/decoding_test.rb
+++ b/activesupport/test/json/decoding_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class TestJSONDecoding < Test::Unit::TestCase
   TESTS = {
diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb
index 4e4fe5703e..6382a444ba 100644
--- a/activesupport/test/json/encoding_test.rb
+++ b/activesupport/test/json/encoding_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
+require 'abstract_unit'
 
 class TestJSONEncoding < Test::Unit::TestCase
   class Foo
diff --git a/activesupport/test/option_merger_test.rb b/activesupport/test/option_merger_test.rb
index 0cddfe8c21..509c6d3bad 100644
--- a/activesupport/test/option_merger_test.rb
+++ b/activesupport/test/option_merger_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/abstract_unit'
+require 'abstract_unit'
 
 class OptionMergerTest < Test::Unit::TestCase
   def setup
diff --git a/activesupport/test/ordered_options_test.rb b/activesupport/test/ordered_options_test.rb
index bf7339ac57..1a1d0c7648 100644
--- a/activesupport/test/ordered_options_test.rb
+++ b/activesupport/test/ordered_options_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/abstract_unit'
+require 'abstract_unit'
 
 class OrderedHashTest < Test::Unit::TestCase
   def setup
diff --git a/activesupport/test/test_test.rb b/activesupport/test/test_test.rb
index eecbd31f98..9ac54db69b 100644
--- a/activesupport/test/test_test.rb
+++ b/activesupport/test/test_test.rb
@@ -1,5 +1,6 @@
-require File.dirname(__FILE__) + '/abstract_unit'
+require 'abstract_unit'
 require 'active_support/test_case'
+
 class AssertDifferenceTest < Test::Unit::TestCase
   def setup
     @object = Class.new do
diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb
index c2a3e1c532..a974d85dd7 100644
--- a/activesupport/test/time_zone_test.rb
+++ b/activesupport/test/time_zone_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/abstract_unit'
+require 'abstract_unit'
 
 class TimeZoneTest < Test::Unit::TestCase
   class MockTime
diff --git a/activesupport/test/whiny_nil_test.rb b/activesupport/test/whiny_nil_test.rb
index 4483134be1..4cb22c41b2 100644
--- a/activesupport/test/whiny_nil_test.rb
+++ b/activesupport/test/whiny_nil_test.rb
@@ -6,7 +6,7 @@ module ActiveRecord
   end
 end
 
-require File.dirname(__FILE__) + '/abstract_unit'
+require 'abstract_unit'
 require 'active_support/whiny_nil'
 
 class WhinyNilTest < Test::Unit::TestCase
-- 
cgit v1.2.3