Merge pull request #2514 from myronmarston/fix_active_record_observer_disabling

Allow ActiveRecord observers to be disabled.

1 files changed, 12 insertions, 0 deletions

diff --git a/activemodel/test/cases/observing_test.rb b/activemodel/test/cases/observing_test.rb
index 99b1f407ae..f6ec24ae57 100644
--- a/activemodel/test/cases/observing_test.rb
+++ b/activemodel/test/cases/observing_test.rb
@@ -17,6 +17,10 @@ class FooObserver < ActiveModel::Observer
   def on_spec(record)
     stub.event_with(record) if stub
   end
+
+  def around_save(record)
+    yield :in_around_save
+  end
 end
 
 class Foo
@@ -133,4 +137,12 @@ class ObserverTest < ActiveModel::TestCase
     foo = Foo.new
     Foo.send(:notify_observers, :whatever, foo)
   end
+
+  test "update passes a block on to the observer" do
+    yielded_value = nil
+    FooObserver.instance.update(:around_save, Foo.new) do |val|
+      yielded_value = val
+    end
+    assert_equal :in_around_save, yielded_value
+  end
 end