Fix ArgumentError message for without method

rails · May 22, 2021 · 70dec80 · 70dec80
1 parent 3bd6b68
commit 70dec80
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
@@ -1162,7 +1162,7 @@ def excluding(*records)
       records.compact!
 
       unless records.all?(klass)
-        raise ArgumentError, "You must only pass a single or collection of #{klass.name} objects to #excluding."
+        raise ArgumentError, "You must only pass a single or collection of #{klass.name} objects to ##{__callee__}."
       end
 
       spawn.excluding!(records)

diff --git a/activerecord/test/cases/excluding_test.rb b/activerecord/test/cases/excluding_test.rb
@@ -48,6 +48,9 @@ def test_does_not_exclude_records_when_no_arguments
   def test_raises_on_record_from_different_class
     error = assert_raises(ArgumentError) { Post.excluding(@post, comments(:greetings)) }
     assert_equal "You must only pass a single or collection of Post objects to #excluding.", error.message
+
+    error = assert_raises(ArgumentError) { Post.without(@post, comments(:greetings)) }
+    assert_equal "You must only pass a single or collection of Post objects to #without.", error.message
   end
 
   private