From fa03fa773528da88ed7c6eb6826530423c7526b2 Mon Sep 17 00:00:00 2001
From: Sean Griffin <sean@thoughtbot.com>
Date: Tue, 1 Jul 2014 07:46:56 -0600
Subject: Silence warning emitted in tests
The instance method `model_name` was being defined multiple times,
causing a redefinition warning.
---
activemodel/lib/active_model/naming.rb | 1 +
1 file changed, 1 insertion(+)
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb
index 8cf1a191f4..86f5c96af9 100644
--- a/activemodel/lib/active_model/naming.rb
+++ b/activemodel/lib/active_model/naming.rb
@@ -216,6 +216,7 @@ module ActiveModel
module Naming
def self.extended(base) #:nodoc:
base.class_eval do
+ remove_possible_method(:model_name)
delegate :model_name, to: :class
end
end
--
cgit v1.2.3