diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-01-29 00:37:39 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-01-29 00:37:39 +0000 |
| commit | 01b1a8772928fbf31180341356981b95d0581413 (patch) | |
| tree | 16d9939a713b79c91f5a14c799fb4e12790ecfff /activesupport/test/option_merger_test.rb | |
| parent | 94046542e274f76ec9d31721a73a19e4b651fbfc (diff) | |
| download | rails-01b1a8772928fbf31180341356981b95d0581413.tar.gz rails-01b1a8772928fbf31180341356981b95d0581413.tar.bz2 rails-01b1a8772928fbf31180341356981b95d0581413.zip | |
Added reusable reloading support through the inclusion of the Relodable module that all subclasses of ActiveRecord::Base, ActiveRecord::Observer, ActiveController::Base, and ActionMailer::Base automatically gets [DHH]. Added auto-loading support for classes in modules, so Conductor::Migration will look for conductor/migration.rb and Conductor::Database::Settings will look for conductor/database/settings.rb [Nicholas Seckar]. Refactored extensions to module, class, and object in active support [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3493 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/test/option_merger_test.rb')
| -rw-r--r-- | activesupport/test/option_merger_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/test/option_merger_test.rb b/activesupport/test/option_merger_test.rb index baa2cd30f3..f5287d5725 100644 --- a/activesupport/test/option_merger_test.rb +++ b/activesupport/test/option_merger_test.rb @@ -2,7 +2,7 @@ require 'test/unit' unless defined? ActiveSupport::OptionMerger require File.dirname(__FILE__) + '/../lib/active_support/option_merger' - require File.dirname(__FILE__) + '/../lib/active_support/core_ext/object_and_class' + require File.dirname(__FILE__) + '/../lib/active_support/core_ext/object' end class OptionMergerTest < Test::Unit::TestCase |