aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/option_merger_test.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-07-25 18:12:20 -0300
committerJosé Valim <jose.valim@gmail.com>2010-07-25 23:30:27 +0200
commitb0b9bf320409b66c6c6b680371aca590297cd4cc (patch)
tree4bb7ad3854fb5aacba070c0ddc5f5e4ebd77a551 /activesupport/test/option_merger_test.rb
parentf4200b0cd5c21d7bd37a9b5c9effc2006485ed46 (diff)
downloadrails-b0b9bf320409b66c6c6b680371aca590297cd4cc.tar.gz
rails-b0b9bf320409b66c6c6b680371aca590297cd4cc.tar.bz2
rails-b0b9bf320409b66c6c6b680371aca590297cd4cc.zip
Object#returning removed
Signed-off-by: José Valim <jose.valim@gmail.com>
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 b898292c9c..33e3e69666 100644
--- a/activesupport/test/option_merger_test.rb
+++ b/activesupport/test/option_merger_test.rb
@@ -1,5 +1,5 @@
require 'abstract_unit'
-require 'active_support/core_ext/object/misc'
+require 'active_support/core_ext/object/with_options'
class OptionMergerTest < Test::Unit::TestCase
def setup