diff options
Diffstat (limited to 'activesupport/test/option_merger_test.rb')
| -rw-r--r-- | activesupport/test/option_merger_test.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activesupport/test/option_merger_test.rb b/activesupport/test/option_merger_test.rb index 0142db5b65..baa2cd30f3 100644 --- a/activesupport/test/option_merger_test.rb +++ b/activesupport/test/option_merger_test.rb @@ -1,7 +1,9 @@ require 'test/unit' -$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib' -require 'active_support' +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' +end class OptionMergerTest < Test::Unit::TestCase def setup |