1 files changed, 28 insertions, 8 deletions
diff --git a/activerecord/test/cases/validations/presence_validation_test.rb b/activerecord/test/cases/validations/presence_validation_test.rb
index 6f8ad06ab6..868d111b8c 100644
--- a/activerecord/test/cases/validations/presence_validation_test.rb
+++ b/activerecord/test/cases/validations/presence_validation_test.rb
@@ -65,19 +65,39 @@ class PresenceValidationTest < ActiveRecord::TestCase
     assert_nothing_raised { s.valid? }
   end
 
-  def test_does_not_validate_presence_of_if_parent_record_is_validate_false
+  def test_validates_presence_of_virtual_attribute_on_model
     repair_validations(Interest) do
+      Interest.send(:attr_accessor, :abbreviation)
       Interest.validates_presence_of(:topic)
+      Interest.validates_presence_of(:abbreviation)
+
+      interest = Interest.create!(topic: 'Thought Leadering', abbreviation: 'tl')
+      assert interest.valid?
+
+      interest.abbreviation = ''
+
+      assert interest.invalid?
+    end
+  end
+
+  def test_validations_run_on_persisted_record
+    repair_validations(Interest) do
       interest = Interest.new
-      interest.save!(validate: false)
-      assert interest.persisted?
+      interest.save!
+      assert_predicate interest, :valid?
 
-      man = Man.new(interest_ids: [interest.id])
-      man.save!
+      Interest.validates_presence_of(:topic)
 
-      assert_equal man.interests.size, 1
-      assert interest.valid?
-      assert man.valid?
+      assert_not_predicate interest, :valid?
+    end
+  end
+
+  def test_validates_presence_with_on_context
+    repair_validations(Interest) do
+      Interest.validates_presence_of(:topic, on: :required_name)
+      interest = Interest.new
+      interest.save!
+      assert_not interest.valid?(:required_name)
     end
   end
 end