Remove deprecated support to passing arguments to `#select` when a block is provided.

3 files changed, 5 insertions, 10 deletions

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 64c51062d1..ae7587e8d1 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Remove deprecated support to passing arguments to `#select` when a block is provided.
+
+    *Rafael Mendonça França*
+
 *   Remove deprecated support to query using commas on LIMIT.
 
     *Rafael Mendonça França*
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 2dcb2f49cd..2d19395191 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -243,9 +243,7 @@ module ActiveRecord
     def select(*fields)
       if block_given?
         if fields.any?
-          ActiveSupport::Deprecation.warn(<<-WARNING.squish)
-            When select is called with a block, it ignores other arguments. This behavior is now deprecated and will result in an ArgumentError in Rails 5.1. You can safely remove the arguments to resolve the deprecation warning because they do not have any effect on the output of the call to the select method with a block.
-          WARNING
+          raise ArgumentError, "`select' with block doesn't take arguments."
         end
 
         return super()
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index b65b58e0a0..cbecfa84ff 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -788,13 +788,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal [1], posts(:welcome).comments.select { |c| c.id == 1 }.map(&:id)
   end
 
-  def test_select_with_block_and_specific_attributes
-    assert_deprecated do
-      comments = posts(:welcome).comments.select(:id, :body) { |c| c.id == 1 }
-      assert_equal [1], comments.map(&:id)
-    end
-  end
-
   def test_select_without_foreign_key
     assert_equal companies(:first_firm).accounts.first.credit_limit, companies(:first_firm).accounts.select(:credit_limit).first.credit_limit
   end