observers leak across tests, so rather than modify the object, we should just count the number of times the observer was called

1 files changed, 12 insertions, 6 deletions

diff --git a/activerecord/test/cases/lifecycle_test.rb b/activerecord/test/cases/lifecycle_test.rb
index a42f5d9c9d..6cd8494c9e 100644
--- a/activerecord/test/cases/lifecycle_test.rb
+++ b/activerecord/test/cases/lifecycle_test.rb
@@ -8,8 +8,12 @@ require 'models/comment'
 class SpecialDeveloper < Developer; end
 
 class DeveloperObserver < ActiveRecord::Observer
+  def calls
+    @calls ||= []
+  end
+
   def before_save(developer)
-    developer.salary += 1
+    calls << developer
   end
 end
 
@@ -202,12 +206,14 @@ class LifecycleTest < ActiveRecord::TestCase
     assert_equal developer, SalaryChecker.instance.last_saved
   end
 
-  test "callback observing the ancestor does not fire multiple times on descendent" do
-    DeveloperObserver.instance # activate
+  def test_observer_is_called_once
+    observer = DeveloperObserver.instance # activate
+    observer.calls.clear
+
     developer = Developer.create! :name => 'Ancestor', :salary => 100000
-    assert_equal 100001, developer.salary, 'ancestor callback fired multiple times'
-    developer = SpecialDeveloper.create! :name => 'Descendent', :salary => 100000
-    assert_equal 100001, developer.salary, 'descendent callback fired multiple times'
+    special_developer = SpecialDeveloper.create! :name => 'Descendent', :salary => 100000
+
+    assert_equal [developer, special_developer], observer.calls
   end
 
 end