new_callbacks core extensions

2 files changed, 8 insertions, 5 deletions

diff --git a/activesupport/lib/active_support/new_callbacks.rb b/activesupport/lib/active_support/new_callbacks.rb
index 356d70b650..7a48dbac04 100644
--- a/activesupport/lib/active_support/new_callbacks.rb
+++ b/activesupport/lib/active_support/new_callbacks.rb
@@ -1,3 +1,6 @@
+require 'active_support/core_ext/array/wrap'
+require 'active_support/core_ext/class/inheritable_attributes'
+
 module ActiveSupport
   # Callbacks are hooks into the lifecycle of an object that allow you to trigger logic
   # before or after an alteration of the object state.
diff --git a/activesupport/test/new_callbacks_test.rb b/activesupport/test/new_callbacks_test.rb
index 5cde078b65..abe7790ebf 100644
--- a/activesupport/test/new_callbacks_test.rb
+++ b/activesupport/test/new_callbacks_test.rb
@@ -19,11 +19,11 @@ module NewCallbacksTest
 
     class << self
       def callback_symbol(callback_method)
-        returning(:"#{callback_method}_method") do |method_name|
-          define_method(method_name) do
-            history << [callback_method, :symbol]
-          end
+        method_name = :"#{callback_method}_method"
+        define_method(method_name) do
+          history << [callback_method, :symbol]
         end
+        method_name
       end
 
       def callback_string(callback_method)
@@ -381,4 +381,4 @@ module NewCallbacksTest
       assert_equal ["first", "second", "third", "second", "first"], terminator.history
     end
   end
-end
\ No newline at end of file
+end