Undefine most private methods on DefinitionProxy

xian · Jul 5, 2011 · 289ba43 · 289ba43
1 parent 3f15c23
commit 289ba43
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/factory_girl/definition_proxy.rb b/lib/factory_girl/definition_proxy.rb
@@ -1,7 +1,9 @@
 module FactoryGirl
   class DefinitionProxy
-    instance_methods.each do |method|
-      undef_method(method) unless method =~ /(^__|^nil\?$|^send$|^object_id$|^extend$|^instance_eval$)/
+    UNPROXIED_METHODS = %w(__send__ nil? send object_id extend instance_eval initialize block_given? raise)
+
+    (instance_methods + private_instance_methods).each do |method|
+      undef_method(method) unless UNPROXIED_METHODS.include?(method)
     end
 
     attr_reader :child_factories

diff --git a/spec/factory_girl/definition_proxy_spec.rb b/spec/factory_girl/definition_proxy_spec.rb
@@ -37,6 +37,11 @@
     }.should raise_error(FactoryGirl::AttributeDefinitionError)
   end
 
+  it "should add an attribute with a built-in private method" do
+    subject.instance_eval { sleep(0.1) }
+    factory.attributes.map { |attribute| attribute.name }.should == [:sleep]
+  end
+
   describe "child factories" do
     its(:child_factories) { should == [] }