Merge pull request #3549 from luckydev/rmethod

remove_method tests and changes

2 files changed, 30 insertions, 2 deletions

diff --git a/activemodel/lib/active_model/observing.rb b/activemodel/lib/active_model/observing.rb
index 7a910d18e7..cd8eb357de 100644
--- a/activemodel/lib/active_model/observing.rb
+++ b/activemodel/lib/active_model/observing.rb
@@ -187,8 +187,7 @@ module ActiveModel
       def observe(*models)
         models.flatten!
         models.collect! { |model| model.respond_to?(:to_sym) ? model.to_s.camelize.constantize : model }
-        remove_possible_method(:observed_classes)
-        define_method(:observed_classes) { models }
+        redefine_method(:observed_classes) { models }
       end
 
       # Returns an array of Classes to observe.
diff --git a/activesupport/test/core_ext/module/remove_method_test.rb b/activesupport/test/core_ext/module/remove_method_test.rb
new file mode 100644
index 0000000000..4657f0c175
--- /dev/null
+++ b/activesupport/test/core_ext/module/remove_method_test.rb
@@ -0,0 +1,29 @@
+require 'abstract_unit'
+require 'active_support/core_ext/module/remove_method'
+
+module RemoveMethodTests
+  class A
+    def do_something
+      return 1
+    end
+    
+  end
+end
+
+class RemoveMethodTest < ActiveSupport::TestCase
+  
+  def test_remove_method_from_an_object
+    RemoveMethodTests::A.class_eval{
+      self.remove_possible_method(:do_something)
+    }
+    assert !RemoveMethodTests::A.new.respond_to?(:do_something)
+  end
+  
+  def test_redefine_method_in_an_object
+    RemoveMethodTests::A.class_eval{
+      self.redefine_method(:do_something) { return 100 }
+    }
+    assert_equal 100, RemoveMethodTests::A.new.do_something
+  end
+
+end
\ No newline at end of file