Resolved conflict

1 files changed, 24 insertions, 0 deletions

diff --git a/activesupport/test/callbacks_test.rb b/activesupport/test/callbacks_test.rb
index 7f71ca2262..c3f683bdb5 100644
--- a/activesupport/test/callbacks_test.rb
+++ b/activesupport/test/callbacks_test.rb
@@ -84,6 +84,30 @@ class CallbacksTest < Test::Unit::TestCase
   end
 end
 
+class MetaclassCallbacksTest < Test::Unit::TestCase
+  module ModuleWithCallbacks
+    def self.extended(object)
+      object.metaclass.before_save :raise_metaclass_callback_called
+    end
+
+    def module_callback_called?
+      @module_callback_called ||= false
+    end
+
+    def raise_metaclass_callback_called
+      @module_callback_called = true
+    end
+  end
+
+  def test_metaclass_callbacks
+    person = Person.new
+    person.extend(ModuleWithCallbacks)
+    assert !person.module_callback_called?
+    person.save
+    assert person.module_callback_called?
+  end
+end
+
 class ConditionalCallbackTest < Test::Unit::TestCase
   def test_save_conditional_person
     person = ConditionalPerson.new