2 files changed, 53 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 04b67cdf3a..344ee6416d 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Allow before and after validations to take an array of lifecycle events
+
+    *John Foley*
+
 *   Support for specifying transaction isolation level
 
     If your database supports setting the isolation level for a transaction, you can set
diff --git a/activerecord/test/cases/callbacks_test.rb b/activerecord/test/cases/callbacks_test.rb
index deeef3a3fd..7457bafd4e 100644
--- a/activerecord/test/cases/callbacks_test.rb
+++ b/activerecord/test/cases/callbacks_test.rb
@@ -137,6 +137,32 @@ class OnCallbacksDeveloper < ActiveRecord::Base
   end
 end
 
+class ContextualCallbacksDeveloper < ActiveRecord::Base
+  self.table_name = 'developers'
+
+  before_validation { history << :before_validation }
+  before_validation :before_validation_on_create_and_update, :on => [ :create, :update ]
+
+  validate do
+    history << :validate
+  end
+
+  after_validation { history << :after_validation }
+  after_validation :after_validation_on_create_and_update, :on => [ :create, :update ]
+
+  def before_validation_on_create_and_update
+    history << "before_validation_on_#{self.validation_context}".to_sym
+  end
+
+  def after_validation_on_create_and_update
+    history << "after_validation_on_#{self.validation_context}".to_sym
+  end
+
+  def history
+    @history ||= []
+  end
+end
+
 class CallbackCancellationDeveloper < ActiveRecord::Base
   self.table_name = 'developers'
 
@@ -285,6 +311,17 @@ class CallbacksTest < ActiveRecord::TestCase
     ], david.history
   end
 
+  def test_validate_on_contextual_create
+    david = ContextualCallbacksDeveloper.create('name' => 'David', 'salary' => 1000000)
+    assert_equal [
+      :before_validation,
+      :before_validation_on_create,
+      :validate,
+      :after_validation,
+      :after_validation_on_create
+    ], david.history
+  end
+
   def test_update
     david = CallbackDeveloper.find(1)
     david.save
@@ -344,6 +381,18 @@ class CallbacksTest < ActiveRecord::TestCase
     ], david.history
   end
 
+  def test_validate_on_contextual_update
+    david = ContextualCallbacksDeveloper.find(1)
+    david.save
+    assert_equal [
+      :before_validation,
+      :before_validation_on_update,
+      :validate,
+      :after_validation,
+      :after_validation_on_update
+    ], david.history
+  end
+
   def test_destroy
     david = CallbackDeveloper.find(1)
     david.destroy