Undef possible method before defining

Without these changes, factory_girl causes massive number of warnings: "warning: method redefined; discarding old ..." "warning: previous definition of ... was here"
thoughtbot · Dec 12, 2015 · 241e8e5 · 241e8e5
1 parent f5e568e
commit 241e8e5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/lib/factory_girl/evaluator.rb b/lib/factory_girl/evaluator.rb
@@ -64,6 +64,10 @@ def self.attribute_list
     end
 
     def self.define_attribute(name, &block)
+      if method_defined?(name) || private_method_defined?(name)
+        undef_method(name)
+      end
+
       define_method(name) do
         if @cached_attributes.key?(name)
           @cached_attributes[name]

diff --git a/lib/factory_girl/strategy_syntax_method_registrar.rb b/lib/factory_girl/strategy_syntax_method_registrar.rb
@@ -39,6 +39,10 @@ def define_pair_strategy_method
 
     def define_syntax_method(name, &block)
       FactoryGirl::Syntax::Methods.module_exec do
+        if method_defined?(name) || private_method_defined?(name)
+          undef_method(name)
+        end
+
         define_method(name, &block)
       end
     end