From c6d685ba1118cc1f6303122117df945ebe8fceae Mon Sep 17 00:00:00 2001
From: Eric Chahin <erc73@cornell.edu>
Date: Thu, 1 May 2014 02:38:15 -0400
Subject: Fixed custom validation context bug where child associations were not
 being saved.

Fixes #13854.

[Eric Chahin, Aaron Nelson, & Kevin Casey]
---
 activerecord/CHANGELOG.md                                      |  7 +++++++
 activerecord/lib/active_record/autosave_association.rb         |  3 ++-
 .../test/cases/associations/has_many_associations_test.rb      | 10 ++++++++++
 activerecord/test/models/pirate.rb                             |  6 ++++++
 activerecord/test/models/ship.rb                               |  6 ++++++
 5 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 17b71199aa..e8e41192de 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,10 @@
+*   Rails will now pass a custom validation context through to autosave associations 
+    in order to validate child associations with the same context.
+
+    Fixes #13854.
+
+    *Eric Chahin*, *Aaron Nelson*, *Kevin Casey*
+
 *   When using a custom `join_table` name on a `habtm`, rails was not saving it
     on Reflections. This causes a problem when rails loads fixtures, because it
     uses the reflections to set database with fixtures.
diff --git a/activerecord/lib/active_record/autosave_association.rb b/activerecord/lib/active_record/autosave_association.rb
index f149d8f127..a30e5e4579 100644
--- a/activerecord/lib/active_record/autosave_association.rb
+++ b/activerecord/lib/active_record/autosave_association.rb
@@ -304,7 +304,8 @@ module ActiveRecord
       def association_valid?(reflection, record)
         return true if record.destroyed? || record.marked_for_destruction?
 
-        unless valid = record.valid?
+        validation_context = self.validation_context unless [:create,:update].include?(self.validation_context)
+        unless valid = record.valid?(validation_context)
           if reflection.options[:autosave]
             record.errors.each do |attribute, message|
               attribute = "#{reflection.name}.#{attribute}"
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index 2f5c9d6e1b..000ea8055a 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -26,6 +26,8 @@ require 'models/reference'
 require 'models/job'
 require 'models/college'
 require 'models/student'
+require 'models/pirate'
+require 'models/ship'
 
 class HasManyAssociationsTestForReorderWithJoinDependency < ActiveRecord::TestCase
   fixtures :authors, :posts, :comments
@@ -1877,4 +1879,12 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
       end
     end
   end
+
+  test 'has_many_association passes context validation to validate children' do
+    pirate = FamousPirate.new
+    pirate.famous_ships << ship = FamousShip.new
+    assert_equal true, pirate.valid?
+    assert_equal false, pirate.valid?(:conference)
+    assert_equal "can't be blank", ship.errors[:name].first
+  end
 end
diff --git a/activerecord/test/models/pirate.rb b/activerecord/test/models/pirate.rb
index e472cf951d..90a3c3ecee 100644
--- a/activerecord/test/models/pirate.rb
+++ b/activerecord/test/models/pirate.rb
@@ -84,3 +84,9 @@ end
 class DestructivePirate < Pirate
   has_one :dependent_ship, :class_name => 'Ship', :foreign_key => :pirate_id, :dependent => :destroy
 end
+
+class FamousPirate < ActiveRecord::Base
+  self.table_name = 'pirates'
+  has_many :famous_ships
+  validates_presence_of :catchphrase, on: :conference
+end
\ No newline at end of file
diff --git a/activerecord/test/models/ship.rb b/activerecord/test/models/ship.rb
index 3da031946f..77a4728d0b 100644
--- a/activerecord/test/models/ship.rb
+++ b/activerecord/test/models/ship.rb
@@ -17,3 +17,9 @@ class Ship < ActiveRecord::Base
     false
   end
 end
+
+class FamousShip < ActiveRecord::Base
+  self.table_name = 'ships'
+  belongs_to :famous_pirate
+  validates_presence_of :name, on: :conference
+end
-- 
cgit v1.2.3