aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/option_merger_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-01-05 13:31:04 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2008-01-05 13:31:04 +0000
commitf6d852665987142fb85ab26da9cc01f5d9b65d46 (patch)
treeab6acf54b41bcd80621f8aa701d2e84b02621134 /activesupport/test/option_merger_test.rb
parentb144818698ee8bd9190efe465611c9f83d5a685e (diff)
downloadrails-f6d852665987142fb85ab26da9cc01f5d9b65d46.tar.gz
rails-f6d852665987142fb85ab26da9cc01f5d9b65d46.tar.bz2
rails-f6d852665987142fb85ab26da9cc01f5d9b65d46.zip
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
Diffstat (limited to 'activesupport/test/option_merger_test.rb')
-rw-r--r--activesupport/test/option_merger_test.rb2
1 files changed, 1 insertions, 1 deletions
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