5 files changed, 18 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 720651fa1f..265459f79e 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -713,6 +713,8 @@ module ActionDispatch
   class IntegrationTest < ActiveSupport::TestCase
     include TestProcess
 
+    undef :assigns
+
     module UrlOptions
       extend ActiveSupport::Concern
       def url_options
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index d3bc77d3ef..cf96b9b752 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -383,6 +383,14 @@ class IntegrationTestTest < ActiveSupport::TestCase
       mixin.__send__(:remove_method, :method_missing)
     end
   end
+
+  def test_assigns_is_undefined_and_not_point_to_the_gem
+    e = assert_raises(NoMethodError) do
+      @test.assigns(:foo)
+    end
+
+    assert_match(/undefined method/, e.message)
+  end
 end
 
 # Tests that integration tests don't call Controller test methods for processing.
diff --git a/actionpack/test/controller/live_stream_test.rb b/actionpack/test/controller/live_stream_test.rb
index 1361e95081..e76628b936 100644
--- a/actionpack/test/controller/live_stream_test.rb
+++ b/actionpack/test/controller/live_stream_test.rb
@@ -157,7 +157,9 @@ module ActionController
         response.headers["Content-Type"] = "text/event-stream"
         response.stream.write "before load"
         sleep 0.01
-        ::LoadMe
+        silence_warning do
+          ::LoadMe
+        end
         response.stream.close
         latch.count_down
 
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index 9b692f55d2..57020e00c9 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -282,6 +282,10 @@ module ActiveRecord
       end
 
       def autosave=(autosave)
+        # autosave and inverse_of do not get along together nowadays. They may
+        # for example cause double saves. Thus, we disable this flag. If in the
+        # future those two flags are known to work well together, this could be
+        # removed.
         @automatic_inverse_of = false
         @options[:autosave] = autosave
         parent_reflection = self.parent_reflection
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index dcaae5b462..2e18c43b1b 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -1522,7 +1522,7 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal Post.where(author_id: 1).to_a, author_posts.to_a
 
     all_posts = relation.only(:limit)
-    assert_equal Post.limit(1).to_a.first, all_posts.first
+    assert_equal Post.limit(1).to_a, all_posts.to_a
   end
 
   def test_anonymous_extension