1 files changed, 41 insertions, 0 deletions
diff --git a/activemodel/test/cases/validations/validations_context_test.rb b/activemodel/test/cases/validations/validations_context_test.rb
new file mode 100644
index 0000000000..06bd8e7903
--- /dev/null
+++ b/activemodel/test/cases/validations/validations_context_test.rb
@@ -0,0 +1,41 @@
+# encoding: utf-8
+require 'cases/helper'
+require 'cases/tests_database'
+
+require 'models/topic'
+
+class ValidationsContextTest < ActiveRecord::TestCase
+  include ActiveModel::TestsDatabase
+
+  def teardown
+    Topic.reset_callbacks(:validate)
+    Topic._validators.clear
+  end
+
+  ERROR_MESSAGE = "Validation error from validator"
+
+  class ValidatorThatAddsErrors < ActiveModel::Validator
+    def validate(record)
+      record.errors[:base] << ERROR_MESSAGE
+    end
+  end
+
+  test "with a class that adds errors on update and validating a new model with no arguments" do
+    Topic.validates_with(ValidatorThatAddsErrors, :on => :create)
+    topic = Topic.new
+    assert topic.valid?, "Validation doesn't run on create if 'on' is set to update"
+  end
+
+  test "with a class that adds errors on update and validating a new model" do
+    Topic.validates_with(ValidatorThatAddsErrors, :on => :update)
+    topic = Topic.new
+    assert topic.valid?(:create), "Validation doesn't run on create if 'on' is set to update"
+  end
+
+  test "with a class that adds errors on create and validating a new model" do
+    Topic.validates_with(ValidatorThatAddsErrors, :on => :create)
+    topic = Topic.new
+    assert topic.invalid?(:create), "Validation does run on create if 'on' is set to create"
+    assert topic.errors[:base].include?(ERROR_MESSAGE)
+  end
+end
+\ No newline at end of file