Merge pull request #16000 from sgrif/sg-silence-warning

Silence warning emitted in tests

activemodel/lib/active_model/naming.rb

@@ -216,6 +216,7 @@ def _singularize(string, replacement='_')
   module Naming
     def self.extended(base) #:nodoc:
       base.class_eval do
+        remove_possible_method(:model_name)
         delegate :model_name, to: :class
       end
     end