factory_girl 2.0.0.beta3 → 2.0.0.beta4

data/GETTING_STARTED.md

@@ -52,10 +52,10 @@ factory_girl supports several different build strategies: build, create, attribu
     # Returns a saved User instance
     user = FactoryGirl.create(:user)
 
-    # Returns a hash of attributes that can be used to build a User instance:
+    # Returns a hash of attributes that can be used to build a User instance
     attrs = FactoryGirl.attributes_for(:user)
 
-    # Returns an object with all defined attributes stubbed out:
+    # Returns an object with all defined attributes stubbed out
     stub = FactoryGirl.stub(:user)
 
 No matter which strategy is used, it's possible to override the defined attributes by passing a hash:
@@ -104,8 +104,7 @@ Attributes can be based on the values of other attributes using the proxy that i
 Associations
 ------------
 
-Associated instances can be generated by using the association method when
-defining a lazy attribute:
+It's possbile to set up associations within factories. If the factory name is the same as the association name, the factory name can be left out.
 
     factory :post do
       # ...
@@ -131,25 +130,39 @@ The behavior of the association method varies depending on the build strategy us
     post.new_record?       # => true
     post.author.new_record # => false
 
-If the factory name is the same as the association name, the factory name can
-be left out.
-
 Inheritance
 -----------
 
-You can easily create multiple factories for the same class without repeating common attributes by using inheritance:
+You can easily create multiple factories for the same class without repeating common attributes by nesting factories:
+
+    factory :post do
+      title 'A title'
+
+      factory :approved_post do
+        approved true
+      end
+    end
+
+    approved_post = FactoryGirl.create(:approved_post)
+    approved_post.title # => 'A title'
+    approved_post.approved # => true
+
+You can also assign the parent explicitly:
 
     factory :post do
-      # the 'title' attribute is required for all posts
       title 'A title'
     end
 
     factory :approved_post, :parent => :post do
       approved true
-      # the 'approver' association is required for an approved post
-      association :approver, :factory => :user
     end
 
+    approved_post = FactoryGirl.create(:approved_post)
+    approved_post.title # => 'A title'
+    approved_post.approved # => true
+
+As mentioned above, it's good practice to define a basic factory for each class with only the attributes required to create it. Then, create more specific factories that inherit from this basic parent. Factory definitions are still code, so keep them DRY.
+
 Sequences
 ---------
 
@@ -223,7 +236,7 @@ Note that you'll have an instance of the user in the block.  This can be useful.
 You can also define multiple types of callbacks on the same factory:
 
     factory :user do
-      after_build  { |user| do_something_to(user) }
+      after_build  { |user| do_something_to(user)      }
       after_create { |user| do_something_else_to(user) }
     end
 
@@ -231,7 +244,7 @@ Factories can also define any number of the same kind of callback.  These callba
 
     factory :user do
       after_create { this_runs_first }
-      after_create { then_this }
+      after_create { then_this       }
     end
 
 Calling FactoryGirl.create will invoke both after_build and after_create callbacks.
@@ -264,7 +277,7 @@ Users' tastes for syntax vary dramatically, but most users are looking for a com
 
     User.blueprint do
       name  { 'Billy Bob' }
-      email { Sham.email }
+      email { Sham.email  }
     end
 
     User.make(:name => 'Johnny')

data/lib/factory_girl/definition_proxy.rb

@@ -4,8 +4,11 @@ module FactoryGirl
       undef_method(method) unless method =~ /(^__|^nil\?$|^send$|^object_id$|^extend$|^instance_eval$)/
     end
 
+    attr_reader :child_factories
+
     def initialize(factory)
       @factory = factory
+      @child_factories = []
     end
 
     # Adds an attribute that should be assigned on generated instances for this
@@ -143,5 +146,9 @@ module FactoryGirl
     def to_create(&block)
       @factory.to_create(&block)
     end
+
+    def factory(name, options = {}, &block)
+      @child_factories << [name, options, block]
+    end
   end
 end

data/lib/factory_girl/syntax/default.rb

@@ -15,11 +15,15 @@ module FactoryGirl
         def factory(name, options = {}, &block)
           factory = Factory.new(name, options)
           proxy = FactoryGirl::DefinitionProxy.new(factory)
-          proxy.instance_eval(&block)
+          proxy.instance_eval(&block) if block_given?
           if parent = options.delete(:parent)
             factory.inherit_from(FactoryGirl.factory_by_name(parent))
           end
           FactoryGirl.register_factory(factory)
+
+          proxy.child_factories.each do |(child_name, child_options, child_block)|
+            factory(child_name, child_options.merge(:parent => name), &child_block)
+          end
         end
 
         def sequence(name, start_value = 1, &block)

data/lib/factory_girl/version.rb

@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "2.0.0.beta3"
+  VERSION = "2.0.0.beta4"
 end
 

data/spec/acceptance/attribute_aliases_spec.rb

@@ -10,8 +10,7 @@ describe "attribute aliases" do
     end
 
     FactoryGirl.define do
-      factory :user do
-      end
+      factory :user
 
       factory :post do
         user

data/spec/acceptance/attributes_for_spec.rb

@@ -15,8 +15,7 @@ describe "a generated attributes hash" do
     end
 
     FactoryGirl.define do
-      factory :user do
-      end
+      factory :user
 
       factory :post do
         title { "default title" }

data/spec/acceptance/build_spec.rb

@@ -12,8 +12,7 @@ describe "a built instance" do
     end
 
     FactoryGirl.define do
-      factory :user do
-      end
+      factory :user
 
       factory :post do
         user

data/spec/acceptance/build_stubbed_spec.rb

@@ -14,8 +14,7 @@ describe "a generated stub instance" do
     end
 
     FactoryGirl.define do
-      factory :user do
-      end
+      factory :user
 
       factory :post do
         title { "default title" }

data/spec/acceptance/create_spec.rb

@@ -12,8 +12,7 @@ describe "a created instance" do
     end
 
     FactoryGirl.define do
-      factory :user do
-      end
+      factory :user
 
       factory :post do
         user

data/spec/acceptance/default_strategy_spec.rb

@@ -6,8 +6,7 @@ describe "default strategy" do
     define_model('User')
 
     FactoryGirl.define do
-      factory :user do
-      end
+      factory :user
     end
 
     Factory(:user).should_not be_new_record
@@ -17,8 +16,7 @@ describe "default strategy" do
     define_model('User')
 
     FactoryGirl.define do
-      factory :user, :default_strategy => :build do
-      end
+      factory :user, :default_strategy => :build
     end
 
     Factory(:user).should be_new_record

data/spec/acceptance/definition_spec.rb

@@ -6,8 +6,7 @@ describe "an instance generated by a factory with a custom class name" do
     define_model("User", :admin => :boolean)
 
     FactoryGirl.define do
-      factory :user do
-      end
+      factory :user
 
       factory :admin, :class => User do
         admin { true }

data/spec/acceptance/definition_without_block_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+require 'acceptance/acceptance_helper'
+
+describe "an instance generated by a factory" do
+  before do
+    define_model("User")
+
+    FactoryGirl.define do
+      factory :user
+    end
+  end
+
+  it "registers the user factory" do
+    FactoryGirl.factory_by_name(:user).should be_a(FactoryGirl::Factory)
+  end
+end

data/spec/acceptance/parent_spec.rb

@@ -7,33 +7,29 @@ describe "an instance generated by a factory that inherits from another factory"
 
     FactoryGirl.define do
       factory :user do
-        name { "John" }
-        email { "john@example.com" }
-      end
+        name  "John"
+        email "john@example.com"
 
-      factory :admin, :parent => :user do
-        admin { true }
-        email { "admin@example.com" }
+        factory :admin do
+          admin true
+          email "admin@example.com"
+        end
       end
     end
   end
 
-  subject { FactoryGirl.create(:admin) }
-
-  it "uses the parent build class" do
-    subject.should be_kind_of(User)
-  end
-
-  it "inherits attributes" do
-    subject.name.should == 'John'
-  end
-
-  it "has its own attributes" do
-    subject.should be_admin
+  describe "the parent class" do
+    subject     { FactoryGirl.create(:user) }
+    it          { should_not be_admin }
+    its(:email) { should == "john@example.com" }
   end
 
-  it "overrides attributes" do
-    subject.email.should == 'admin@example.com'
+  describe "the child class" do
+    subject     { FactoryGirl.create(:admin) }
+    it          { should be_kind_of(User) }
+    it          { should be_admin }
+    its(:name)  { should == "John" }
+    its(:email) { should == "admin@example.com" }
   end
 end
 

data/spec/factory_girl/definition_proxy_spec.rb

@@ -37,6 +37,16 @@ describe FactoryGirl::DefinitionProxy do
     }.should raise_error(FactoryGirl::AttributeDefinitionError)
   end
 
+  describe "child factories" do
+    its(:child_factories) { should == [] }
+
+    it "should be able to add child factories" do
+      block = lambda {}
+      subject.factory(:admin, { :aliases => [:great] }, &block)
+      subject.child_factories.should == [[:admin, { :aliases => [:great] }, block]]
+    end
+  end
+
   describe "adding an attribute using a in-line sequence" do
     it "should create the sequence" do
       mock(FactoryGirl::Sequence).new(:name, 1)

metadata

@@ -2,7 +2,7 @@
 name: factory_girl
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.beta3
+  version: 2.0.0.beta4
 platform: ruby
 authors: 
 - Joe Ferris
@@ -153,6 +153,7 @@ files:
 - spec/acceptance/create_spec.rb
 - spec/acceptance/default_strategy_spec.rb
 - spec/acceptance/definition_spec.rb
+- spec/acceptance/definition_without_block_spec.rb
 - spec/acceptance/parent_spec.rb
 - spec/acceptance/sequence_spec.rb
 - spec/acceptance/syntax/blueprint_spec.rb
@@ -225,6 +226,7 @@ test_files:
 - spec/acceptance/create_spec.rb
 - spec/acceptance/default_strategy_spec.rb
 - spec/acceptance/definition_spec.rb
+- spec/acceptance/definition_without_block_spec.rb
 - spec/acceptance/parent_spec.rb
 - spec/acceptance/sequence_spec.rb
 - spec/acceptance/syntax/blueprint_spec.rb