From adebb207805cb573b2387f478b4a5549badab5e9 Mon Sep 17 00:00:00 2001
From: Edgars Beigarts <edgars.beigarts@gmail.com>
Date: Fri, 2 Dec 2016 17:09:09 +0200
Subject: Reload association scope inside autosaved associations

---
 .../lib/active_record/autosave_association.rb      |  6 ++---
 .../test/cases/autosave_association_test.rb        | 27 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/activerecord/lib/active_record/autosave_association.rb b/activerecord/lib/active_record/autosave_association.rb
index b343332bae..9d0b501862 100644
--- a/activerecord/lib/active_record/autosave_association.rb
+++ b/activerecord/lib/active_record/autosave_association.rb
@@ -383,6 +383,9 @@ module ActiveRecord
         if association = association_instance_get(reflection.name)
           autosave = reflection.options[:autosave]
 
+          # reconstruct the scope now that we know the owner's id
+          association.reset_scope if association.respond_to?(:reset_scope)
+
           if records = associated_records_to_validate_or_save(association, @new_record_before_save, autosave)
             if autosave
               records_to_destroy = records.select(&:marked_for_destruction?)
@@ -408,9 +411,6 @@ module ActiveRecord
               raise ActiveRecord::Rollback unless saved
             end
           end
-
-          # reconstruct the scope now that we know the owner's id
-          association.reset_scope if association.respond_to?(:reset_scope)
         end
       end
 
diff --git a/activerecord/test/cases/autosave_association_test.rb b/activerecord/test/cases/autosave_association_test.rb
index a3f82ed49d..336cf9f28f 100644
--- a/activerecord/test/cases/autosave_association_test.rb
+++ b/activerecord/test/cases/autosave_association_test.rb
@@ -649,6 +649,33 @@ class TestDefaultAutosaveAssociationOnAHasManyAssociation < ActiveRecord::TestCa
     assert_equal 2, firm.clients.length
     assert_includes firm.clients, Client.find_by_name("New Client")
   end
+
+  def test_inverse_association_within_autosave_after_save_callback
+    posts = Class.new(ActiveRecord::Base) do
+      self.table_name = "posts"
+    end
+    comments = Class.new(ActiveRecord::Base) do
+      self.table_name = "comments"
+    end
+    posts.class_eval do
+      has_many :comments, inverse_of: :post, foreign_key: :post_id, anonymous_class: comments
+    end
+    comments.class_eval do
+      belongs_to :post, inverse_of: :comments, anonymous_class: posts
+
+      attr_accessor :post_comments_count
+      after_save do
+        self.post_comments_count = post.comments.count
+      end
+    end
+
+    post = posts.new(title: "Test", body: "...")
+    comment = post.comments.build(body: "...")
+    post.save!
+
+    assert_equal 1, post.comments.count
+    assert_equal 1, comment.post_comments_count
+  end
 end
 
 class TestDefaultAutosaveAssociationOnNewRecord < ActiveRecord::TestCase
-- 
cgit v1.2.3


From e7f4c45bdc178c41face92e4be9ec027a07daeda Mon Sep 17 00:00:00 2001
From: Edgars Beigarts <edgars.beigarts@gmail.com>
Date: Tue, 6 Dec 2016 08:09:10 +0200
Subject: Improve test without using anonymous classes

---
 .../test/cases/autosave_association_test.rb        | 51 ++++++++++------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/activerecord/test/cases/autosave_association_test.rb b/activerecord/test/cases/autosave_association_test.rb
index 336cf9f28f..77ee3ca2d7 100644
--- a/activerecord/test/cases/autosave_association_test.rb
+++ b/activerecord/test/cases/autosave_association_test.rb
@@ -649,33 +649,6 @@ class TestDefaultAutosaveAssociationOnAHasManyAssociation < ActiveRecord::TestCa
     assert_equal 2, firm.clients.length
     assert_includes firm.clients, Client.find_by_name("New Client")
   end
-
-  def test_inverse_association_within_autosave_after_save_callback
-    posts = Class.new(ActiveRecord::Base) do
-      self.table_name = "posts"
-    end
-    comments = Class.new(ActiveRecord::Base) do
-      self.table_name = "comments"
-    end
-    posts.class_eval do
-      has_many :comments, inverse_of: :post, foreign_key: :post_id, anonymous_class: comments
-    end
-    comments.class_eval do
-      belongs_to :post, inverse_of: :comments, anonymous_class: posts
-
-      attr_accessor :post_comments_count
-      after_save do
-        self.post_comments_count = post.comments.count
-      end
-    end
-
-    post = posts.new(title: "Test", body: "...")
-    comment = post.comments.build(body: "...")
-    post.save!
-
-    assert_equal 1, post.comments.count
-    assert_equal 1, comment.post_comments_count
-  end
 end
 
 class TestDefaultAutosaveAssociationOnNewRecord < ActiveRecord::TestCase
@@ -1726,3 +1699,27 @@ class TestAutosaveAssociationWithTouch < ActiveRecord::TestCase
     assert_nothing_raised { invoice.line_items.create(amount: 10) }
   end
 end
+
+class TestAutosaveAssociationOnAHasManyAssociationWithInverse < ActiveRecord::TestCase
+  class Post < ActiveRecord::Base
+    has_many :comments, inverse_of: :post
+  end
+
+  class Comment < ActiveRecord::Base
+    belongs_to :post, inverse_of: :comments
+
+    attr_accessor :post_comments_count
+    after_save do
+      self.post_comments_count = post.comments.count
+    end
+  end
+
+  def test_after_save_callback_with_autosave
+    post = Post.new(title: "Test", body: "...")
+    comment = post.comments.build(body: "...")
+    post.save!
+
+    assert_equal 1, post.comments.count
+    assert_equal 1, comment.post_comments_count
+  end
+end
-- 
cgit v1.2.3