kotovalexarian-likes-github/thoughtbot--factory_bot
1
0
Fork 0
mirror of https://github.com/thoughtbot/factory_bot.git synced 2022-11-09 11:43:51 -05:00
Code Releases Activity

Dynamic attributes referencing dynamic attributes of child factories work correctly

Browse source 
Fixes #173
This commit is contained in:
Joshua Clayton 2011-08-08 23:46:26 -04:00
parent 2ccbf4561b
commit 8012d3d81b
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/factory_girl/factory.rb
View file

@ -45,7 +45,11 @@ module FactoryGirl
new_attributes = []
parent.attributes.each do |attribute|
unless attribute_defined?(attribute.name)
if attribute_defined?(attribute.name)
@attributes.delete_if do |attrib|
new_attributes << attrib.clone if attrib.name == attribute.name
end
else
new_attributes << attribute.clone
end
end

4
spec/acceptance/parent_spec.rb
View file

@ -3,12 +3,13 @@ require 'acceptance/acceptance_helper'
describe "an instance generated by a factory that inherits from another factory" do
before do
define_model("User", :name => :string, :admin => :boolean, :email => :string, :upper_email => :string)
define_model("User", :name => :string, :admin => :boolean, :email => :string, :upper_email => :string, :login => :string)
FactoryGirl.define do
factory :user do
name "John"
email { "#{name.downcase}@example.com" }
login { email }
factory :admin do
name "admin"
@ -43,6 +44,7 @@ describe "an instance generated by a factory that inherits from another factory"
it { should_not be_admin }
its(:name) { should == "John" }
its(:email) { should eql "John-guest@example.com" }
its(:login) { should == "John-guest@example.com" }
end
end