Merge branch 'master' into mdluo-master

* master:
  Move required error message and changelog to Active Record
  Use public Module#include, in favor of https://bugs.ruby-lang.org/issues/8846
  Use Module#include instead of send :include, since now is a public method [ci skip]
  :scissors: warning from controller renderer test

Conflicts:
	activerecord/CHANGELOG.md

5 files changed, 10 insertions, 10 deletions

diff --git a/actionpack/test/controller/helper_test.rb b/actionpack/test/controller/helper_test.rb
index 936b8c2450..e263ed341f 100644
--- a/actionpack/test/controller/helper_test.rb
+++ b/actionpack/test/controller/helper_test.rb
@@ -29,7 +29,7 @@ module ImpressiveLibrary
   def useful_function() end
 end
 
-ActionController::Base.send :include, ImpressiveLibrary
+ActionController::Base.include(ImpressiveLibrary)
 
 class JustMeController < ActionController::Base
   clear_helpers
@@ -223,10 +223,10 @@ class HelperTest < ActiveSupport::TestCase
     # fun/pdf_helper.rb
     assert methods.include?(:foobar)
   end
-  
+
   def test_helper_proxy_config
     AllHelpersController.config.my_var = 'smth'
-    
+
     assert_equal 'smth', AllHelpersController.helpers.config.my_var
   end
 
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 2139cf2661..17d5bae00b 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -682,7 +682,7 @@ class IntegrationProcessTest < ActionDispatch::IntegrationTest
           get 'get/:action', :to => controller, :as => :get_action
         end
 
-        self.singleton_class.send(:include, set.url_helpers)
+        self.singleton_class.include(set.url_helpers)
 
         yield
       end
diff --git a/actionpack/test/controller/localized_templates_test.rb b/actionpack/test/controller/localized_templates_test.rb
index 2be947c648..3576015513 100644
--- a/actionpack/test/controller/localized_templates_test.rb
+++ b/actionpack/test/controller/localized_templates_test.rb
@@ -30,7 +30,7 @@ class LocalizedTemplatesTest < ActionController::TestCase
 
   def test_use_fallback_locales
     I18n.locale = :"de-AT"
-    I18n.backend.class.send(:include, I18n::Backend::Fallbacks)
+    I18n.backend.class.include(I18n::Backend::Fallbacks)
     I18n.fallbacks[:"de-AT"] = [:de]
 
     get :hello_world
diff --git a/actionpack/test/controller/renderer_test.rb b/actionpack/test/controller/renderer_test.rb
index 6d5508323b..b55a25430b 100644
--- a/actionpack/test/controller/renderer_test.rb
+++ b/actionpack/test/controller/renderer_test.rb
@@ -65,10 +65,10 @@ class RendererTest < ActiveSupport::TestCase
   end
 
   test 'same defaults from the same controller' do
-    defaults = ->(controller) { controller.renderer.defaults }
+    renderer_defaults = ->(controller) { controller.renderer.defaults }
 
-    assert defaults[AccountsController].equal? defaults[AccountsController]
-    assert_not defaults[AccountsController].equal? defaults[CommentsController]
+    assert renderer_defaults[AccountsController].equal? renderer_defaults[AccountsController]
+    assert_not renderer_defaults[AccountsController].equal? renderer_defaults[CommentsController]
   end
 
   test 'rendering with different formats' do
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index 05806177e3..02e7614ba2 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -1184,7 +1184,7 @@ class ResourcesTest < ActionController::TestCase
       end
 
       @controller = "#{options[:options][:controller].camelize}Controller".constantize.new
-      @controller.singleton_class.send(:include, @routes.url_helpers)
+      @controller.singleton_class.include(@routes.url_helpers)
       @request    = ActionController::TestRequest.new
       @response   = ActionController::TestResponse.new
       get :index, params: options[:options]
@@ -1254,7 +1254,7 @@ class ResourcesTest < ActionController::TestCase
     def assert_singleton_named_routes_for(singleton_name, options = {})
       (options[:options] ||= {})[:controller] ||= singleton_name.to_s.pluralize
       @controller = "#{options[:options][:controller].camelize}Controller".constantize.new
-      @controller.singleton_class.send(:include, @routes.url_helpers)
+      @controller.singleton_class.include(@routes.url_helpers)
       @request    = ActionController::TestRequest.new
       @response   = ActionController::TestResponse.new
       get :show, params: options[:options]