Factory.aliases should not alias attributes like "_id"

Vasfed · Jul 26, 2010 · 418cbfb · 418cbfb
1 parent 4824125
commit 418cbfb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/factory_girl/aliases.rb b/lib/factory_girl/aliases.rb
@@ -4,7 +4,7 @@ class << self
     attr_accessor :aliases #:nodoc:
   end
   self.aliases = [
-    [/(.*)_id/, '\1'],
+    [/(.+)_id/, '\1'],
     [/(.*)/, '\1_id']
   ]
 

diff --git a/spec/factory_girl/aliases_spec.rb b/spec/factory_girl/aliases_spec.rb
@@ -14,6 +14,10 @@
     FactoryGirl.aliases_for(:test).should include(:test_id)
   end
 
+  it "should NOT include an attribute as an alias when it starts with underscore" do
+    FactoryGirl.aliases_for(:_id).should_not include(:id)
+  end
+
   describe "after adding an alias" do
 
     before do