From e9bbe96ae8adc8a1fa34ed785f1771adbc5ee613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Fri, 16 Apr 2010 16:20:31 +0200
Subject: [PATCH 1/2] merge callbacks_observers_test.rb into lifecycle_test.rb where other observers test reside

Benefits: test able to run independently, subclassing instead of changing the original Comment model
---
 .../test/cases/callbacks_observers_test.rb         |   37 --------------------
 activerecord/test/cases/lifecycle_test.rb          |   34 ++++++++++++++++++
 2 files changed, 34 insertions(+), 37 deletions(-)
 delete mode 100644 activerecord/test/cases/callbacks_observers_test.rb

diff --git a/activerecord/test/cases/callbacks_observers_test.rb b/activerecord/test/cases/callbacks_observers_test.rb
deleted file mode 100644
index 52ce384..0000000
--- a/activerecord/test/cases/callbacks_observers_test.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require "cases/helper"
-
-class Comment < ActiveRecord::Base
-  attr_accessor :callers
-
-  before_validation :record_callers
-
-  after_validation do
-    record_callers
-  end
-
-  def record_callers
-    callers << self.class if callers
-  end
-end
-
-class CommentObserver < ActiveRecord::Observer
-  attr_accessor :callers
-
-  def after_validation(model)
-    callers << self.class if callers
-  end
-end
-
-class CallbacksObserversTest < ActiveRecord::TestCase
-  def test_model_callbacks_fire_before_observers_are_notified
-    callers = []
-
-    comment = Comment.new
-    comment.callers = callers
-
-    CommentObserver.instance.callers = callers
-
-    comment.valid?
-    assert_equal [Comment, Comment, CommentObserver], callers, "model callbacks did not fire before observers were notified"
-  end
-end
diff --git a/activerecord/test/cases/lifecycle_test.rb b/activerecord/test/cases/lifecycle_test.rb
index fcad3e9..13d7bfc 100644
--- a/activerecord/test/cases/lifecycle_test.rb
+++ b/activerecord/test/cases/lifecycle_test.rb
@@ -3,6 +3,7 @@ require 'models/topic'
 require 'models/developer'
 require 'models/reply'
 require 'models/minimalistic'
+require 'models/comment'
 
 class SpecialDeveloper < Developer; end
 
@@ -57,6 +58,28 @@ class MultiObserver < ActiveRecord::Observer
   end
 end
 
+class ValidatedComment < Comment
+  attr_accessor :callers
+
+  before_validation :record_callers
+
+  after_validation do
+    record_callers
+  end
+
+  def record_callers
+    callers << self.class if callers
+  end
+end
+
+class ValidatedCommentObserver < ActiveRecord::Observer
+  attr_accessor :callers
+
+  def after_validation(model)
+    callers << self.class if callers
+  end
+end
+
 class LifecycleTest < ActiveRecord::TestCase
   fixtures :topics, :developers, :minimalistics
 
@@ -125,4 +148,15 @@ class LifecycleTest < ActiveRecord::TestCase
   def test_invalid_observer
     assert_raise(ArgumentError) { Topic.observers = Object.new; Topic.instantiate_observers }
   end
+  
+  test "model callbacks fire before observers are notified" do
+    callers = []
+
+    comment = ValidatedComment.new
+    comment.callers = ValidatedCommentObserver.instance.callers = callers
+
+    comment.valid?
+    assert_equal [ValidatedComment, ValidatedComment, ValidatedCommentObserver], callers,
+      "model callbacks did not fire before observers were notified"
+  end
 end
-- 
1.7.0.4


From 13a4acbf23ad147d4753ed0634e57614b794343e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Fri, 16 Apr 2010 17:02:49 +0200
Subject: [PATCH 2/2] ActiveRecord::Observer "before" callbacks always prevent saving the record (failing test)

---
 activerecord/test/cases/lifecycle_test.rb |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/activerecord/test/cases/lifecycle_test.rb b/activerecord/test/cases/lifecycle_test.rb
index 13d7bfc..64c0e06 100644
--- a/activerecord/test/cases/lifecycle_test.rb
+++ b/activerecord/test/cases/lifecycle_test.rb
@@ -7,6 +7,14 @@ require 'models/comment'
 
 class SpecialDeveloper < Developer; end
 
+class SalaryChecker < ActiveRecord::Observer
+  observe :special_developer
+
+  def before_save(developer)
+    return developer.salary > 80000
+  end
+end
+
 class TopicaAuditor < ActiveRecord::Observer
   observe :topic
 
@@ -159,4 +167,16 @@ class LifecycleTest < ActiveRecord::TestCase
     assert_equal [ValidatedComment, ValidatedComment, ValidatedCommentObserver], callers,
       "model callbacks did not fire before observers were notified"
   end
+
+  test "able to save developer" do
+    SalaryChecker.instance # activate
+    developer = SpecialDeveloper.new :name => 'Roger', :salary => 100000
+    assert developer.save, "developer with normal salary failed to save"
+  end
+
+  test "unable to save developer with low salary" do
+    SalaryChecker.instance # activate
+    developer = SpecialDeveloper.new :name => 'Rookie', :salary => 50000
+    assert !developer.save, "allowed to save a developer with too low salary"
+  end
 end
-- 
1.7.0.4