vitalish-factory_girl 1.2.5 → 1.2.6

data/lib/factory_girl/syntax.rb

@@ -1,12 +1,12 @@
-module FactoryGirl
+class Factory
   # Provides alternate syntaxes for factory_girl. If you don't like the default
-  # syntax for defining or using factories, look at one of the
-  # FactoryGirl::Syntax modules:
+  # syntax for defining or using factories, look at one of the Factory::Syntax
+  # modules:
   #
-  # * FactoryGirl::Syntax::Blueprint: definition syntax similar to Machinist
-  # * FactoryGirl::Syntax::Generate: usage syntax similar to Object Daddy
-  # * FactoryGirl::Syntax::Make: usage syntax similar to Machinist
-  # * FactoryGirl::Syntax::Sham: sequence syntax similar to Machinist
+  # * Factory::Syntax::Blueprint: definition syntax similar to Machinist
+  # * Factory::Syntax::Generate: usage syntax similar to Object Daddy
+  # * Factory::Syntax::Make: usage syntax similar to Machinist
+  # * Factory::Syntax::Sham: sequence syntax similar to Machinist
   module Syntax
   end
 end

data/lib/factory_girl.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'factory_girl/proxy'
 require 'factory_girl/proxy/build'
 require 'factory_girl/proxy/create'
@@ -11,14 +12,24 @@ require 'factory_girl/attribute/association'
 require 'factory_girl/attribute/callback'
 require 'factory_girl/sequence'
 require 'factory_girl/aliases'
-require 'factory_girl/definition_proxy'
-require 'factory_girl/syntax/default'
-require 'factory_girl/syntax/vintage'
-require 'factory_girl/find_definitions'
-require 'factory_girl/deprecated'
-require 'factory_girl/version'
 
-if defined?(Rails) && Rails::VERSION::MAJOR == 2
-  require 'factory_girl/rails2'
+# Shortcut for Factory.default_strategy.
+#
+# Example:
+#   Factory(:user, :name => 'Joe')
+def Factory (name, attrs = {})
+  Factory.default_strategy(name, attrs)
+end
+
+if defined? Rails.configuration
+  Rails.configuration.after_initialize do
+    Factory.definition_file_paths = [
+      File.join(RAILS_ROOT, 'test', 'factories'),
+      File.join(RAILS_ROOT, 'spec', 'factories')
+    ]
+    Factory.find_definitions
+  end
+else
+  Factory.find_definitions
 end
 

data/spec/factory_girl/aliases_spec.rb

@@ -1,21 +1,17 @@
-require 'spec_helper'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 describe Factory, "aliases" do
 
   it "should include an attribute as an alias for itself by default" do
-    FactoryGirl.aliases_for(:test).should include(:test)
+    Factory.aliases_for(:test).should include(:test)
   end
 
   it "should include the root of a foreign key as an alias by default" do
-    FactoryGirl.aliases_for(:test_id).should include(:test)
+    Factory.aliases_for(:test_id).should include(:test)
   end
 
   it "should include an attribute's foreign key as an alias by default" do
-    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)
+    Factory.aliases_for(:test).should include(:test_id)
   end
 
   describe "after adding an alias" do
@@ -25,7 +21,7 @@ describe Factory, "aliases" do
     end
 
     it "should return the alias in the aliases list" do
-      FactoryGirl.aliases_for(:test_suffix).should include(:test)
+      Factory.aliases_for(:test_suffix).should include(:test)
     end
 
   end

data/spec/factory_girl/attribute/association_spec.rb

@@ -1,11 +1,11 @@
-require 'spec_helper'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
-describe FactoryGirl::Attribute::Association do
+describe Factory::Attribute::Association do
   before do
     @name      = :author
     @factory   = :user
     @overrides = { :first_name => 'John' }
-    @attr      = FactoryGirl::Attribute::Association.new(@name, @factory, @overrides)
+    @attr      = Factory::Attribute::Association.new(@name, @factory, @overrides)
   end
 
   it "should have a name" do
@@ -24,6 +24,6 @@ describe FactoryGirl::Attribute::Association do
   end
 
   it "should convert names to symbols" do
-    FactoryGirl::Attribute::Association.new('name', :user, {}).name.should == :name
+    Factory::Attribute::Association.new('name', :user, {}).name.should == :name
   end
 end

data/spec/factory_girl/attribute/callback_spec.rb

@@ -1,10 +1,10 @@
-require 'spec_helper'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
-describe FactoryGirl::Attribute::Callback do
+describe Factory::Attribute::Callback do
   before do
     @name  = :after_create
     @block = proc{ 'block' }
-    @attr  = FactoryGirl::Attribute::Callback.new(@name, @block)
+    @attr  = Factory::Attribute::Callback.new(@name, @block)
   end
 
   it "should have a name" do
@@ -18,6 +18,6 @@ describe FactoryGirl::Attribute::Callback do
   end
 
   it "should convert names to symbols" do
-    FactoryGirl::Attribute::Callback.new('name', nil).name.should == :name
+    Factory::Attribute::Callback.new('name', nil).name.should == :name
   end
 end

data/spec/factory_girl/attribute/dynamic_spec.rb

@@ -1,10 +1,10 @@
-require 'spec_helper'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
-describe FactoryGirl::Attribute::Dynamic do
+describe Factory::Attribute::Dynamic do
   before do
     @name  = :first_name
     @block = lambda { 'value' }
-    @attr  = FactoryGirl::Attribute::Dynamic.new(@name, @block)
+    @attr  = Factory::Attribute::Dynamic.new(@name, @block)
   end
 
   it "should have a name" do
@@ -20,41 +20,30 @@ describe FactoryGirl::Attribute::Dynamic do
 
   it "should yield the proxy to the block when adding its value to a proxy" do
     @block = lambda {|a| a }
-    @attr  = FactoryGirl::Attribute::Dynamic.new(:user, @block)
+    @attr  = Factory::Attribute::Dynamic.new(:user, @block)
     @proxy = "proxy"
     stub(@proxy).set
     @attr.add_to(@proxy)
     @proxy.should have_received.set(:user, @proxy)
   end
 
-  it "evaluates the block with in the context of the proxy without an argument" do
-    result = 'other attribute value'
-    @block = lambda { other_attribute }
-    @attr  = FactoryGirl::Attribute::Dynamic.new(:user, @block)
-    @proxy = "proxy"
-    stub(@proxy).set
-    stub(@proxy).other_attribute { result }
-    @attr.add_to(@proxy)
-    @proxy.should have_received.set(:user, result)
-  end
-
   it "should raise an error when defining an attribute writer" do
     lambda {
-      FactoryGirl::Attribute::Dynamic.new('test=', nil)
-    }.should raise_error(FactoryGirl::AttributeDefinitionError)
+      Factory::Attribute::Dynamic.new('test=', nil)
+    }.should raise_error(Factory::AttributeDefinitionError)
   end
 
   it "should raise an error when returning a sequence" do
-    stub(Factory).sequence { FactoryGirl::Sequence.new }
+    stub(Factory).sequence { Factory::Sequence.new }
     block = lambda { Factory.sequence(:email) }
-    attr = FactoryGirl::Attribute::Dynamic.new(:email, block)
+    attr = Factory::Attribute::Dynamic.new(:email, block)
     proxy = stub!.set.subject
     lambda {
       attr.add_to(proxy)
-    }.should raise_error(FactoryGirl::SequenceAbuseError)
+    }.should raise_error(Factory::SequenceAbuseError)
   end
 
   it "should convert names to symbols" do
-    FactoryGirl::Attribute::Dynamic.new('name', nil).name.should == :name
+    Factory::Attribute::Dynamic.new('name', nil).name.should == :name
   end
 end

data/spec/factory_girl/attribute/static_spec.rb

@@ -1,10 +1,10 @@
-require 'spec_helper'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
-describe FactoryGirl::Attribute::Static do
+describe Factory::Attribute::Static do
   before do
     @name  = :first_name
     @value = 'John'
-    @attr  = FactoryGirl::Attribute::Static.new(@name, @value)
+    @attr  = Factory::Attribute::Static.new(@name, @value)
   end
 
   it "should have a name" do
@@ -19,11 +19,11 @@ describe FactoryGirl::Attribute::Static do
 
   it "should raise an error when defining an attribute writer" do
     lambda {
-      FactoryGirl::Attribute::Static.new('test=', nil)
-    }.should raise_error(FactoryGirl::AttributeDefinitionError)
+      Factory::Attribute::Static.new('test=', nil)
+    }.should raise_error(Factory::AttributeDefinitionError)
   end
 
   it "should convert names to symbols" do
-    FactoryGirl::Attribute::Static.new('name', nil).name.should == :name
+    Factory::Attribute::Static.new('name', nil).name.should == :name
   end
 end

data/spec/factory_girl/attribute_spec.rb

@@ -1,9 +1,9 @@
-require 'spec_helper'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
-describe FactoryGirl::Attribute do
+describe Factory::Attribute do
   before do
     @name  = :user
-    @attr  = FactoryGirl::Attribute.new(@name)
+    @attr  = Factory::Attribute.new(@name)
   end
 
   it "should have a name" do
@@ -20,11 +20,11 @@ describe FactoryGirl::Attribute do
   it "should raise an error when defining an attribute writer" do
     error_message = %{factory_girl uses 'f.test value' syntax rather than 'f.test = value'}
     lambda {
-      FactoryGirl::Attribute.new('test=')
-    }.should raise_error(FactoryGirl::AttributeDefinitionError, error_message)
+      Factory::Attribute.new('test=')
+    }.should raise_error(Factory::AttributeDefinitionError, error_message)
   end
 
   it "should convert names to symbols" do
-    FactoryGirl::Attribute.new('name').name.should == :name
+    Factory::Attribute.new('name').name.should == :name
   end
 end

data/spec/factory_girl/factory_spec.rb

@@ -1,411 +1,571 @@
-require 'spec_helper'
-
-describe FactoryGirl::Factory, "registering a factory" do
-  before do
-    @name    = :user
-    @factory = "factory"
-    @aliases = [:one, :two]
-    stub(@factory).name { @name }
-    stub(@factory).aliases { @aliases }
-  end
-
-  it "should add the factory to the list of factories" do
-    FactoryGirl.register_factory(@factory)
-    FactoryGirl.factory_by_name(@name).should == @factory
-  end
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
-  it "should not allow a duplicate factory definition" do
-    lambda {
-      2.times { FactoryGirl.register_factory(@factory) }
-    }.should raise_error(FactoryGirl::DuplicateDefinitionError)
-  end
+describe Factory do
+  describe "defining a factory" do
+    before do
+      @name    = :user
+      @factory = "factory"
+      stub(@factory).factory_name { @name }
+      @options = { :class => 'magic' }
+      stub(Factory).new { @factory }
+    end
 
-  it "registers aliases" do
-    FactoryGirl.register_factory(@factory)
-    @aliases.each do |name|
-      FactoryGirl.factory_by_name(name).should == @factory
+    it "should create a new factory using the specified name and options" do
+      mock(Factory).new(@name, @options) { @factory }
+      Factory.define(@name, @options) {|f| }
     end
-  end
-end
 
-describe FactoryGirl::Factory do
-  include DefinesConstants
+    it "should pass the factory do the block" do
+      yielded = nil
+      Factory.define(@name) do |y|
+        yielded = y
+      end
+      yielded.should == @factory
+    end
 
-  before do
-    @name    = :user
-    @class   = define_class('User')
-    @factory = FactoryGirl::Factory.new(@name)
-  end
+    it "should add the factory to the list of factories" do
+      Factory.define(@name) {|f| }
+      @factory.should == Factory.factories[@name]
+    end
 
-  it "should have a factory name" do
-    @factory.name.should == @name
+    it "should allow that factory to be found by name" do
+      Factory.factory_by_name(@name).should == @factory
+    end
   end
 
-  it "responds to factory_name" do
-    @factory.factory_name.should == @name
-  end
+  describe "a factory" do
+    before do
+      @name    = :user
+      @class   = User
+      @factory = Factory.new(@name)
+    end
 
-  it "should have a build class" do
-    @factory.build_class.should == @class
-  end
+    it "should have a factory name" do
+      @factory.factory_name.should == @name
+    end
 
-  it "should have a default strategy" do
-    @factory.default_strategy.should == :create
-  end
+    it "should have a build class" do
+      @factory.build_class.should == @class
+    end
 
-  it "should not allow the same attribute to be added twice" do
-    lambda {
-      2.times { @factory.define_attribute FactoryGirl::Attribute::Static.new(:name, 'value') }
-    }.should raise_error(FactoryGirl::AttributeDefinitionError)
-  end
+    it "should have a default strategy" do
+      @factory.default_strategy.should == :create
+    end
 
-  it "should add a callback attribute when defining a callback" do
-    mock(FactoryGirl::Attribute::Callback).new(:after_create, is_a(Proc)) { 'after_create callback' }
-    @factory.add_callback(:after_create) {}
-    @factory.attributes.should include('after_create callback')
-  end
+    it "should not allow the same attribute to be added twice" do
+      lambda {
+        2.times { @factory.add_attribute :first_name }
+      }.should raise_error(Factory::AttributeDefinitionError)
+    end
 
-  it "should raise an InvalidCallbackNameError when defining a callback with an invalid name" do
-    lambda{
-      @factory.add_callback(:invalid_callback_name) {}
-    }.should raise_error(FactoryGirl::InvalidCallbackNameError)
-  end
+    it "should add a static attribute when an attribute is defined with a value" do
+      attribute = 'attribute'
+      stub(attribute).name { :name }
+      mock(Factory::Attribute::Static).new(:name, 'value') { attribute }
+      @factory.add_attribute(:name, 'value')
+    end
 
-  describe "after adding an attribute" do
-    before do
-      @attribute = "attribute"
-      @proxy     = "proxy"
+    it "should add a dynamic attribute when an attribute is defined with a block" do
+      attribute = 'attribute'
+      stub(attribute).name { :name }
+      block     = lambda {}
+      mock(Factory::Attribute::Dynamic).new(:name, block) { attribute }
+      @factory.add_attribute(:name, &block)
+    end
 
-      stub(@attribute).name { :name }
-      stub(@attribute).add_to
-      stub(@proxy).set
-      stub(@proxy).result { 'result' }
-      stub(FactoryGirl::Attribute::Static).new { @attribute }
-      stub(FactoryGirl::Proxy::Build).new { @proxy }
+    it "should raise for an attribute with a value and a block" do
+      lambda {
+        @factory.add_attribute(:name, 'value') {}
+      }.should raise_error(Factory::AttributeDefinitionError)
+    end
 
-      @factory.define_attribute(@attribute)
+    describe "adding an attribute using a in-line sequence" do
+      it "should create the sequence" do
+        mock(Factory::Sequence).new
+        @factory.sequence(:name) {}
+      end
+
+      it "should add a dynamic attribute" do
+        attribute = 'attribute'
+        stub(attribute).name { :name }
+        mock(Factory::Attribute::Dynamic).new(:name, is_a(Proc)) { attribute }
+        @factory.sequence(:name) {}
+        @factory.attributes.should include(attribute)
+      end
     end
 
-    it "should create the right proxy using the build class when running" do
-      mock(FactoryGirl::Proxy::Build).new(@factory.build_class) { @proxy }
-      @factory.run(FactoryGirl::Proxy::Build, {})
+    describe "adding a callback" do
+      it "should add a callback attribute when the after_build attribute is defined" do
+        mock(Factory::Attribute::Callback).new(:after_build, is_a(Proc)) { 'after_build callback' }
+        @factory.after_build {}
+        @factory.attributes.should include('after_build callback')
+      end
+
+      it "should add a callback attribute when the after_create attribute is defined" do
+        mock(Factory::Attribute::Callback).new(:after_create, is_a(Proc)) { 'after_create callback' }
+        @factory.after_create {}
+        @factory.attributes.should include('after_create callback')
+      end
+
+      it "should add a callback attribute when the after_stub attribute is defined" do
+        mock(Factory::Attribute::Callback).new(:after_stub, is_a(Proc)) { 'after_stub callback' }
+        @factory.after_stub {}
+        @factory.attributes.should include('after_stub callback')
+      end
+
+      it "should add a callback attribute when defining a callback" do
+        mock(Factory::Attribute::Callback).new(:after_create, is_a(Proc)) { 'after_create callback' }
+        @factory.callback(:after_create) {}
+        @factory.attributes.should include('after_create callback')
+      end
+
+      it "should raise an InvalidCallbackNameError when defining a callback with an invalid name" do
+        lambda{
+          @factory.callback(:invalid_callback_name) {}
+        }.should raise_error(Factory::InvalidCallbackNameError)
+      end
     end
 
-    it "should add the attribute to the proxy when running" do
-      mock(@attribute).add_to(@proxy)
-      @factory.run(FactoryGirl::Proxy::Build, {})
+    describe "after adding an attribute" do
+      before do
+        @attribute = "attribute"
+        @proxy     = "proxy"
+
+        stub(@attribute).name { :name }
+        stub(@attribute).add_to
+        stub(@proxy).set
+        stub(@proxy).result { 'result' }
+        stub(Factory::Attribute::Static).new { @attribute }
+        stub(Factory::Proxy::Build).new { @proxy }
+
+        @factory.add_attribute(:name, 'value')
+      end
+
+      it "should create the right proxy using the build class when running" do
+        mock(Factory::Proxy::Build).new(@factory.build_class) { @proxy }
+        @factory.run(Factory::Proxy::Build, {})
+      end
+
+      it "should add the attribute to the proxy when running" do
+        mock(@attribute).add_to(@proxy)
+        @factory.run(Factory::Proxy::Build, {})
+      end
+
+      it "should return the result from the proxy when running" do
+        mock(@proxy).result() { 'result' }
+        @factory.run(Factory::Proxy::Build, {}).should == 'result'
+      end
     end
 
-    it "should return the result from the proxy when running" do
-      mock(@proxy).result() { 'result' }
-      @factory.run(FactoryGirl::Proxy::Build, {}).should == 'result'
+    it "should add an association without a factory name or overrides" do
+      factory = Factory.new(:post)
+      name    = :user
+      attr    = 'attribute'
+      mock(Factory::Attribute::Association).new(name, name, {}) { attr }
+      factory.association(name)
+      factory.attributes.should include(attr)
     end
-  end
 
-  it "should return associations" do
-    factory = FactoryGirl::Factory.new(:post)
-    factory.define_attribute(FactoryGirl::Attribute::Association.new(:author, :author, {}))
-    factory.define_attribute(FactoryGirl::Attribute::Association.new(:editor, :editor, {}))
-    factory.associations.each do |association|
-      association.should be_a(FactoryGirl::Attribute::Association)
+    it "should return associations" do
+      factory = Factory.new(:post)
+      factory.association(:author)
+      factory.association(:editor)
+      factory.associations.each do |association|
+        association.should be_a(Factory::Attribute::Association)
+      end
+      factory.associations.size.should == 2
     end
-    factory.associations.size.should == 2
-  end
 
-  it "should raise for a self referencing association" do
-    factory = FactoryGirl::Factory.new(:post)
-    lambda {
-      factory.define_attribute(FactoryGirl::Attribute::Association.new(:parent, :post, {}))
-    }.should raise_error(FactoryGirl::AssociationDefinitionError)
-  end
+    it "should add an association with overrides" do
+      factory   = Factory.new(:post)
+      name      = :user
+      attr      = 'attribute'
+      overrides = { :first_name => 'Ben' }
+      mock(Factory::Attribute::Association).new(name, name, overrides) { attr }
+      factory.association(name, overrides)
+      factory.attributes.should include(attr)
+    end
 
-  describe "when overriding generated attributes with a hash" do
-    before do
-      @name  = :name
-      @value = 'The price is right!'
-      @hash  = { @name => @value }
+    it "should add an association with a factory name" do
+      factory = Factory.new(:post)
+      attr = 'attribute'
+      mock(Factory::Attribute::Association).new(:author, :user, {}) { attr }
+      factory.association(:author, :factory => :user)
+      factory.attributes.should include(attr)
     end
 
-    it "should return the overridden value in the generated attributes" do
-      attr = FactoryGirl::Attribute::Static.new(@name, 'The price is wrong, Bob!')
-      @factory.define_attribute(attr)
-      result = @factory.run(FactoryGirl::Proxy::AttributesFor, @hash)
-      result[@name].should == @value
+    it "should add an association with a factory name and overrides" do
+      factory = Factory.new(:post)
+      attr = 'attribute'
+      mock(Factory::Attribute::Association).new(:author, :user, :first_name => 'Ben') { attr }
+      factory.association(:author, :factory => :user, :first_name => 'Ben')
+      factory.attributes.should include(attr)
     end
 
-    it "should not call a lazy attribute block for an overridden attribute" do
-      attr = FactoryGirl::Attribute::Dynamic.new(@name, lambda { flunk })
-      @factory.define_attribute(attr)
-      result = @factory.run(FactoryGirl::Proxy::AttributesFor, @hash)
+    it "should raise for a self referencing association" do
+      factory = Factory.new(:post)
+      lambda {
+        factory.association(:parent, :factory => :post)
+      }.should raise_error(Factory::AssociationDefinitionError)
     end
 
-    it "should override a symbol parameter with a string parameter" do
-      attr = FactoryGirl::Attribute::Static.new(@name, 'The price is wrong, Bob!')
-      @factory.define_attribute(attr)
-      @hash = { @name.to_s => @value }
-      result = @factory.run(FactoryGirl::Proxy::AttributesFor, @hash)
-      result[@name].should == @value
+    it "should add an attribute using the method name when passed an undefined method" do
+      attribute = 'attribute'
+      stub(attribute).name { :name }
+      block = lambda {}
+      mock(Factory::Attribute::Static).new(:name, 'value') { attribute }
+      @factory.send(:name, 'value')
+      @factory.attributes.should include(attribute)
     end
-  end
 
-  describe "overriding an attribute with an alias" do
-    before do
-      @factory.define_attribute(FactoryGirl::Attribute::Static.new(:test, 'original'))
-      Factory.alias(/(.*)_alias/, '\1')
-      @result = @factory.run(FactoryGirl::Proxy::AttributesFor,
-                             :test_alias => 'new')
+    it "should allow human_name as a static attribute name" do
+      attribute = 'attribute'
+      stub(attribute).name { :name }
+      mock(Factory::Attribute::Static).new(:human_name, 'value') { attribute}
+      @factory.human_name 'value'
     end
 
-    it "should use the passed in value for the alias" do
-      @result[:test_alias].should == 'new'
+    it "should allow human_name as a dynamic attribute name" do
+      attribute = 'attribute'
+      stub(attribute).name { :name }
+      block     = lambda {}
+      mock(Factory::Attribute::Dynamic).new(:human_name, block) { attribute }
+      @factory.human_name(&block)
     end
 
-    it "should discard the predefined value for the attribute" do
-      @result[:test].should be_nil
+    describe "when overriding generated attributes with a hash" do
+      before do
+        @attr  = :name
+        @value = 'The price is right!'
+        @hash  = { @attr => @value }
+      end
+
+      it "should return the overridden value in the generated attributes" do
+        @factory.add_attribute(@attr, 'The price is wrong, Bob!')
+        result = @factory.run(Factory::Proxy::AttributesFor, @hash)
+        result[@attr].should == @value
+      end
+
+      it "should not call a lazy attribute block for an overridden attribute" do
+        @factory.add_attribute(@attr) { flunk }
+        result = @factory.run(Factory::Proxy::AttributesFor, @hash)
+      end
+
+      it "should override a symbol parameter with a string parameter" do
+        @factory.add_attribute(@attr, 'The price is wrong, Bob!')
+        @hash = { @attr.to_s => @value }
+        result = @factory.run(Factory::Proxy::AttributesFor, @hash)
+        result[@attr].should == @value
+      end
     end
-  end
 
-  it "should guess the build class from the factory name" do
-    @factory.build_class.should == User
-  end
+    describe "overriding an attribute with an alias" do
+      before do
+        @factory.add_attribute(:test, 'original')
+        Factory.alias(/(.*)_alias/, '\1')
+        @result = @factory.run(Factory::Proxy::AttributesFor,
+                               :test_alias => 'new')
+      end
+
+      it "should use the passed in value for the alias" do
+        @result[:test_alias].should == 'new'
+      end
+
+      it "should discard the predefined value for the attribute" do
+        @result[:test].should be_nil
+      end
+    end
 
-  it "should create a new factory using the class of the parent" do
-    child = FactoryGirl::Factory.new(:child)
-    child.inherit_from(@factory)
-    child.build_class.should == @factory.build_class
-  end
+    it "should guess the build class from the factory name" do
+      @factory.build_class.should == User
+    end
 
-  it "should create a new factory while overriding the parent class" do
-    child = FactoryGirl::Factory.new(:child, :class => String)
-    child.inherit_from(@factory)
-    child.build_class.should == String
-  end
+    describe "when defined with a custom class" do
+      before do
+        @class   = User
+        @factory = Factory.new(:author, :class => @class)
+      end
 
-  describe "given a parent with attributes" do
-    before do
-      @parent_attr = :name
-      @factory.define_attribute(FactoryGirl::Attribute::Static.new(@parent_attr, 'value'))
+      it "should use the specified class as the build class" do
+        @factory.build_class.should == @class
+      end
     end
 
-    it "should create a new factory with attributes of the parent" do
-      child = FactoryGirl::Factory.new(:child)
-      child.inherit_from(@factory)
-      child.attributes.size.should == 1
-      child.attributes.first.name.should == @parent_attr
-    end
+    describe "when defined with a class instead of a name" do
+      before do
+        @class   = ArgumentError
+        @name    = :argument_error
+        @factory = Factory.new(@class)
+      end
 
-    it "should allow a child to define additional attributes" do
-      child = FactoryGirl::Factory.new(:child)
-      child.define_attribute(FactoryGirl::Attribute::Static.new(:email, 'value'))
-      child.inherit_from(@factory)
-      child.attributes.size.should == 2
+      it "should guess the name from the class" do
+        @factory.factory_name.should == @name
+      end
+
+      it "should use the class as the build class" do
+        @factory.build_class.should == @class
+      end
     end
 
-    it "should allow to override parent attributes" do
-      child = FactoryGirl::Factory.new(:child)
-      @child_attr = FactoryGirl::Attribute::Static.new(@parent_attr, 'value')
-      child.define_attribute(@child_attr)
-      child.inherit_from(@factory)
-      child.attributes.size.should == 1
-      child.attributes.first.should == @child_attr
+    describe "when defined with a custom class name" do
+      before do
+        @class   = ArgumentError
+        @factory = Factory.new(:author, :class => :argument_error)
+      end
+
+      it "should use the specified class as the build class" do
+        @factory.build_class.should == @class
+      end
     end
+  end
 
-    it "should allow to use parent attributes in defining additional attributes" do
-      User.class_eval { attr_accessor :name, :email }
+  describe "a factory with a name ending in s" do
+    before do
+      @name    = :business
+      @class   = Business
+      @factory = Factory.new(@name)
+    end
 
-      child = FactoryGirl::Factory.new(:child)
-      @child_attr = FactoryGirl::Attribute::Dynamic.new(:email, lambda {|u| "#{u.name}@example.com"})
-      child.define_attribute(@child_attr)
-      child.inherit_from(@factory)
-      child.attributes.size.should == 2
+    it "should have a factory name" do
+      @factory.factory_name.should == @name
+    end
 
-      result = child.run(FactoryGirl::Proxy::Build, {})
-      result.email.should == 'value@example.com'
+    it "should have a build class" do
+      @factory.build_class.should == @class
     end
   end
 
-  it "inherit all callbacks" do
-    @factory.add_callback(:after_stub) { |object| object.name = 'Stubby' }
-    child = FactoryGirl::Factory.new(:child)
-    child.inherit_from(@factory)
-    child.attributes.last.should be_kind_of(FactoryGirl::Attribute::Callback)
-  end
-end
+  describe "a factory with a string for a name" do
+    before do
+      @name    = :user
+      @factory = Factory.new(@name.to_s) {}
+    end
 
-describe FactoryGirl::Factory, "when defined with a custom class" do
-  before do
-    @class   = Float
-    @factory = FactoryGirl::Factory.new(:author, :class => @class)
+    it "should convert the string to a symbol" do
+      @factory.factory_name.should == @name
+    end
   end
 
-  it "should use the specified class as the build class" do
-    @factory.build_class.should == @class
-  end
-end
+  describe "a factory defined with a string name" do
+    before do
+      Factory.factories = {}
+      @name    = :user
+      @factory = Factory.define(@name.to_s) {}
+    end
 
-describe FactoryGirl::Factory, "when defined with a class instead of a name" do
-  before do
-    @class   = ArgumentError
-    @name    = :argument_error
-    @factory = FactoryGirl::Factory.new(@class)
+    it "should store the factory using a symbol" do
+      Factory.factories[@name].should == @factory
+    end
   end
 
-  it "should guess the name from the class" do
-    @factory.name.should == @name
-  end
+  describe "after defining a factory" do
+    before do
+      @name    = :user
+      @factory = "factory"
 
-  it "should use the class as the build class" do
-    @factory.build_class.should == @class
-  end
-end
+      Factory.factories[@name] = @factory
+    end
 
-describe FactoryGirl::Factory, "when defined with a custom class name" do
-  before do
-    @class   = ArgumentError
-    @factory = FactoryGirl::Factory.new(:author, :class => :argument_error)
-  end
+    after { Factory.factories.clear }
 
-  it "should use the specified class as the build class" do
-    @factory.build_class.should == @class
-  end
-end
+    it "should use Proxy::AttributesFor for Factory.attributes_for" do
+      mock(@factory).run(Factory::Proxy::AttributesFor, :attr => 'value') { 'result' }
+      Factory.attributes_for(@name, :attr => 'value').should == 'result'
+    end
 
-describe FactoryGirl::Factory, "with a name ending in s" do
-  include DefinesConstants
+    it "should use Proxy::Build for Factory.build" do
+      mock(@factory).run(Factory::Proxy::Build, :attr => 'value') { 'result' }
+      Factory.build(@name, :attr => 'value').should == 'result'
+    end
 
-  before do
-    define_class('Business')
-    @name    = :business
-    @class   = Business
-    @factory = FactoryGirl::Factory.new(@name)
-  end
+    it "should use Proxy::Create for Factory.create" do
+      mock(@factory).run(Factory::Proxy::Create, :attr => 'value') { 'result' }
+      Factory.create(@name, :attr => 'value').should == 'result'
+    end
 
-  it "should have a factory name" do
-    @factory.name.should == @name
-  end
+    it "should use Proxy::Stub for Factory.stub" do
+      mock(@factory).run(Factory::Proxy::Stub, :attr => 'value') { 'result' }
+      Factory.stub(@name, :attr => 'value').should == 'result'
+    end
 
-  it "should have a build class" do
-    @factory.build_class.should == @class
-  end
-end
+    it "should use default strategy option as Factory.default_strategy" do
+      stub(@factory).default_strategy { :create }
+      mock(@factory).run(Factory::Proxy::Create, :attr => 'value') { 'result' }
+      Factory.default_strategy(@name, :attr => 'value').should == 'result'
+    end
 
-describe FactoryGirl::Factory, "with a string for a name" do
-  before do
-    @name    = :string
-    @factory = FactoryGirl::Factory.new(@name.to_s) {}
-  end
+    it "should use the default strategy for the global Factory method" do
+      stub(@factory).default_strategy { :create }
+      mock(@factory).run(Factory::Proxy::Create, :attr => 'value') { 'result' }
+      Factory(@name, :attr => 'value').should == 'result'
+    end
 
-  it "should convert the string to a symbol" do
-    @factory.name.should == @name
-  end
-end
+    [:build, :create, :attributes_for, :stub].each do |method|
+      it "should raise an ArgumentError on #{method} with a nonexistant factory" do
+        lambda { Factory.send(method, :bogus) }.should raise_error(ArgumentError)
+      end
 
-describe FactoryGirl::Factory, "registered with a string name" do
-  before do
-    @name    = :string
-    @factory = FactoryGirl::Factory.new(@name)
-    FactoryGirl.register_factory(@factory)
+      it "should recognize either 'name' or :name for Factory.#{method}" do
+        stub(@factory).run
+        lambda { Factory.send(method, @name.to_s) }.should_not raise_error
+        lambda { Factory.send(method, @name.to_sym) }.should_not raise_error
+      end
+    end
   end
 
-  it "should store the factory using a symbol" do
-    FactoryGirl.factories[@name].should == @factory
-  end
-end
+  describe 'defining a factory with a parent parameter' do
+    before do
+      @parent = Factory.define :object do |f|
+        f.name  'Name'
+      end
+    end
 
-describe FactoryGirl::Factory, "registered with a custom name" do
-  before do
-    @actual_name = :string
-    @custom_name = :words
-    @factory = FactoryGirl::Factory.new(@actual_name)
+    it "should raise an ArgumentError when trying to use a non-existent factory as parent" do
+      lambda {
+        Factory.define(:child, :parent => :nonexsitent) {}
+      }.should raise_error(ArgumentError)
+    end
 
-    FactoryGirl.register_factory(@factory, :as => @custom_name)
-  end
+    it "should create a new factory using the class of the parent" do
+      child = Factory.define(:child, :parent => :object) {}
+      child.build_class.should == @parent.build_class
+    end
 
-  it "finds the factory using the custom name" do
-    FactoryGirl.factory_by_name(@custom_name).should == @factory
-  end
-end
+    it "should create a new factory while overriding the parent class" do
+      class Other; end
 
-describe FactoryGirl::Factory, "for namespaced class" do
-  include DefinesConstants
+      child = Factory.define(:child, :parent => :object, :class => Other) {}
+      child.build_class.should == Other
+    end
 
-  before do
-    define_class('Admin')
-    define_class('Admin::Settings')
+    it "should create a new factory with attributes of the parent" do
+      child = Factory.define(:child, :parent => :object) {}
+      child.attributes.size.should == 1
+      child.attributes.first.name.should == :name
+    end
 
-    @name  = :settings
-    @class = Admin::Settings
-  end
+    it "should allow to define additional attributes" do
+      child = Factory.define(:child, :parent => :object) do |f|
+        f.email 'person@somebody.com'
+      end
+      child.attributes.size.should == 2
+    end
 
-  it "should build namespaced class passed by string" do
-    factory = FactoryGirl::Factory.new(@name.to_s, :class => @class.name)
-    factory.build_class.should == @class
-  end
+    it "should allow to override parent attributes" do
+      child = Factory.define(:child, :parent => :object) do |f|
+        f.name { 'Child Name' }
+      end
+      child.attributes.size.should == 1
+      child.attributes.first.should be_kind_of(Factory::Attribute::Dynamic)
+    end
 
-  it "should build Admin::Settings class from Admin::Settings string" do
-    factory = FactoryGirl::Factory.new(@name.to_s, :class => 'admin/settings')
-    factory.build_class.should == @class
-  end
-end
+    it "inherit all callbacks" do
+      Factory.define(:child, :parent => :object) do |f|
+        f.after_stub {|o| o.name = 'Stubby' }
+      end
 
-describe FactoryGirl::Factory do
-  include DefinesConstants
+      grandchild = Factory.define(:grandchild, :parent => :child) do |f|
+        f.after_stub {|o| o.name = "#{o.name} McStubby" }
+      end
 
-  before do
-    define_class('User')
-    define_class('Admin', User)
+      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)
+    end
   end
 
-  it "should raise an ArgumentError when trying to use a non-existent strategy" do
-    lambda {
-      FactoryGirl::Factory.new(:object, :default_strategy => :nonexistent) {}
-    }.should raise_error(ArgumentError)
-  end
+  describe 'defining a factory with a default strategy parameter' do
+    it "should raise an ArgumentError when trying to use a non-existent factory" do
+      lambda {
+        Factory.define(:object, :default_strategy => :nonexistent) {}
+      }.should raise_error(ArgumentError)
+    end
 
-  it "should create a new factory with a specified default strategy" do
-    factory = FactoryGirl::Factory.new(:object, :default_strategy => :stub)
-    factory.default_strategy.should == :stub
+    it "should create a new factory with a specified default strategy" do
+      factory = Factory.define(:object, :default_strategy => :stub) {}
+      factory.default_strategy.should == :stub
+    end
   end
 
-  describe 'defining a child factory without setting default strategy' do
+  def self.in_directory_with_files(*files)
     before do
-      @parent = FactoryGirl::Factory.new(:object, :default_strategy => :stub)
-      @child = FactoryGirl::Factory.new(:child_object)
-      @child.inherit_from(@parent)
+      @pwd = Dir.pwd
+      @tmp_dir = File.join(File.dirname(__FILE__), 'tmp')
+      FileUtils.mkdir_p @tmp_dir
+      Dir.chdir(@tmp_dir)
+
+      files.each do |file|
+        FileUtils.mkdir_p File.dirname(file)
+        FileUtils.touch file
+        stub(Factory).require(file)
+      end
     end
 
-    it "should inherit default strategy from its parent" do
-      @child.default_strategy.should == :stub
+    after do
+      Dir.chdir(@pwd)
+      FileUtils.rm_rf(@tmp_dir)
     end
   end
 
-  describe 'defining a child factory with a default strategy' do
-    before do
-      @parent = FactoryGirl::Factory.new(:object, :default_strategy => :stub)
-      @child = FactoryGirl::Factory.new(:child_object2, :default_strategy => :build)
-      @child.inherit_from(@parent)
+  def require_definitions_from(file)
+    simple_matcher do |given, matcher|
+      has_received = have_received.require(file)
+      result = has_received.matches?(given)
+      matcher.description = "require definitions from #{file}"
+      matcher.failure_message = has_received.failure_message
+      result
     end
+  end
 
-    it "should override the default strategy from parent" do
-      @child.default_strategy.should == :build
+  share_examples_for "finds definitions" do
+    before do
+      stub(Factory).require
+      Factory.find_definitions
     end
+    subject { Factory }
   end
 
-end
+  describe "with factories.rb" do
+    in_directory_with_files 'factories.rb'
+    it_should_behave_like "finds definitions"
+    it { should require_definitions_from('factories.rb') }
+  end
 
-describe FactoryGirl::Factory, "with an underscore in the name" do
-  subject { FactoryGirl::Factory.new("happy_users") }
+  %w(spec test).each do |dir|
+    describe "with a factories file under #{dir}" do
+      in_directory_with_files File.join(dir, 'factories.rb')
+      it_should_behave_like "finds definitions"
+      it { should require_definitions_from("#{dir}/factories.rb") }
+    end
 
-  it "has a human name" do
-    subject.human_name.should == 'happy users'
-  end
-end
+    describe "with a factories file under #{dir}/factories" do
+      in_directory_with_files File.join(dir, 'factories', 'post_factory.rb')
+      it_should_behave_like "finds definitions"
+      it { should require_definitions_from("#{dir}/factories/post_factory.rb") }
+    end
 
+    describe "with several factories files under #{dir}/factories" do
+      in_directory_with_files File.join(dir, 'factories', 'post_factory.rb'),
+                              File.join(dir, 'factories', 'person_factory.rb')
+      it_should_behave_like "finds definitions"
+      it { should require_definitions_from("#{dir}/factories/post_factory.rb") }
+      it { should require_definitions_from("#{dir}/factories/person_factory.rb") }
+    end
 
-describe FactoryGirl::Factory, "with aliases" do
-  it "registers the aliases" do
-    aliased_name = :guest
-    factory = FactoryGirl::Factory.new("user", :aliases => [aliased_name])
-    factory.aliases.should == [aliased_name]
+    describe "with nested and unnested factories files under #{dir}" do
+      in_directory_with_files File.join(dir, 'factories.rb'),
+                              File.join(dir, 'factories', 'post_factory.rb'),
+                              File.join(dir, 'factories', 'person_factory.rb')
+      it_should_behave_like "finds definitions"
+      it { should require_definitions_from("#{dir}/factories.rb") }
+      it { should require_definitions_from("#{dir}/factories/post_factory.rb") }
+      it { should require_definitions_from("#{dir}/factories/person_factory.rb") }
+    end
   end
+
+  it "should return the factory name without underscores for the human name" do
+    factory = Factory.new(:name_with_underscores)
+    factory.human_name.should == 'name with underscores'
+  end
+
 end