factory_girl 1.3.2 → 1.3.3

data/lib/factory_girl.rb

@@ -21,7 +21,7 @@ def Factory (name, attrs = {})
 end
 
 class Factory
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end
 
 if defined?(Rails) && Rails::VERSION::MAJOR == 2

data/lib/factory_girl/factory.rb

@@ -85,11 +85,14 @@ class Factory
   def inherit_from(parent) #:nodoc:
     @options[:class]            ||= parent.class_name
     @options[:default_strategy] ||= parent.default_strategy
+
+    new_attributes = []
     parent.attributes.each do |attribute|
       unless attribute_defined?(attribute.name)
-        @attributes << attribute.clone
+        new_attributes << attribute.clone
       end
     end
+    @attributes.unshift *new_attributes
   end
 
   # Adds an attribute that should be assigned on generated instances for this

data/spec/factory_girl/factory_spec.rb

@@ -528,6 +528,22 @@ describe Factory do
       child.attributes.first.should be_kind_of(Factory::Attribute::Dynamic)
     end
 
+    it "should allow to use parent attributes in defining additional attributes" do
+      User.class_eval { attr_accessor :name, :email }
+
+      parent = Factory.define(:parent, :class => User) do |f|
+        f.name 'value'
+      end
+
+      child = Factory.new(:child)
+      child.add_attribute(:email) {|u| "#{u.name}@example.com" }
+      child.inherit_from(parent)
+      child.attributes.size.should == 2
+
+      result = child.run(Factory::Proxy::Build, {})
+      result.email.should == 'value@example.com'
+    end
+
     it "inherit all callbacks" do
       Factory.define(:child, :parent => :object) do |f|
         f.after_stub {|o| o.name = 'Stubby' }
@@ -538,8 +554,8 @@ describe Factory do
       end
 
       grandchild.attributes.size.should == 3
-      grandchild.attributes.first.should be_kind_of(Factory::Attribute::Callback)
       grandchild.attributes[1].should be_kind_of(Factory::Attribute::Callback)
+      grandchild.attributes[2].should be_kind_of(Factory::Attribute::Callback)
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: factory_girl
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - Joe Ferris
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-03 00:00:00 -04:00
+date: 2011-01-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency