Merge pull request rails#46238 from austenmadden/resolve-validates-associated-ignores-contexts

Pass validation_context to validates_associated

Author: rafaelfranca

activerecord/CHANGELOG.md

@@ -1,3 +1,10 @@
+*   Validate using `:on` option when using `validates_associated`
+
+    Fixes an issue where `validates_associated` `:on`  option wasn't respected
+    when validated associated records.
+
+    *Austen Madden*, *Alex Ghiculescu*, *Rafał Brize*
+
 *   Allow overriding SQLite defaults from `database.yml`
 
     Any PRAGMA configuration set under the `pragmas` key in the configuration file take precedence over Rails' defaults, and additional PRAGMAs can be set as well.

activerecord/lib/active_record/autosave_association.rb

@@ -547,10 +547,6 @@ def compute_primary_key(reflection, record)
         end
       end
 
-      def custom_validation_context?
-        validation_context && [:create, :update].exclude?(validation_context)
-      end
-
       def _ensure_no_duplicate_errors
         errors.uniq!
       end

activerecord/lib/active_record/validations.rb

@@ -74,6 +74,10 @@ def valid?(context = nil)
 
     alias_method :validate, :valid?
 
+    def custom_validation_context? # :nodoc:
+      validation_context && [:create, :update].exclude?(validation_context)
+    end
+
   private
     def default_validation_context
       new_record? ? :create : :update

activerecord/lib/active_record/validations/associated.rb

@@ -4,14 +4,20 @@ module ActiveRecord
   module Validations
     class AssociatedValidator < ActiveModel::EachValidator # :nodoc:
       def validate_each(record, attribute, value)
-        if Array(value).reject { |r| valid_object?(r) }.any?
+        context = record_validation_context_for_association(record)
+
+        if Array(value).reject { |association| valid_object?(association, context) }.any?
           record.errors.add(attribute, :invalid, **options.merge(value: value))
         end
       end
 
       private
-        def valid_object?(record)
-          (record.respond_to?(:marked_for_destruction?) && record.marked_for_destruction?) || record.valid?
+        def valid_object?(record, context)
+          (record.respond_to?(:marked_for_destruction?) && record.marked_for_destruction?) || record.valid?(context)
+        end
+
+        def record_validation_context_for_association(record)
+          record.custom_validation_context? ? record.validation_context : nil
         end
     end
 

activerecord/test/cases/validations/association_validation_test.rb

@@ -49,7 +49,7 @@ def test_validates_associated_marked_for_destruction
 
   def test_validates_associated_without_marked_for_destruction
     reply = Class.new do
-      def valid?
+      def valid?(context = nil)
         true
       end
     end
@@ -96,4 +96,26 @@ def test_validates_presence_of_belongs_to_association__existing_parent
       assert_predicate interest, :valid?, "Expected interest to be valid, but was not. Interest should have a human object associated"
     end
   end
+
+  def test_validates_associated_with_custom_context
+    Reply.validates_associated :topic, on: :custom
+    Topic.validates_presence_of :content, on: :custom
+    r = Reply.create("title" => "A reply", "content" => "with content!")
+    r.topic = Topic.create("title" => "uhohuhoh")
+    assert_predicate r, :valid?
+    assert_not r.valid?(:custom)
+    assert_equal ["is invalid"], r.errors[:topic]
+  end
+
+  def test_validates_associated_with_create_context
+    Reply.validates_associated :topic, on: :create
+    Topic.validates_presence_of :content, on: :create
+    t = Topic.create(title: "uhoh", content: "stuff")
+    t.update!(content: nil)
+    # NOTE: Does not pass along :create context from reply to Topic validation.
+    r = t.replies.create(title: "A reply", content: "with content!")
+
+    assert_predicate t, :valid?
+    assert_predicate r, :valid?
+  end
 end