factory_girl 2.0.0.beta2 → 2.0.0.beta3

data/lib/factory_girl/version.rb

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

data/spec/acceptance/build_list_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'acceptance/acceptance_helper'
+
+describe "build multiple instances" do
+  before do
+    define_model('Post', :title => :string)
+
+    FactoryGirl.define do
+      factory(:post) do |post|
+        post.title "Through the Looking Glass"
+      end
+    end
+  end
+
+  context "without default attributes" do
+    subject { FactoryGirl.build_list(:post, 20) }
+
+    its(:length) { should == 20 }
+
+    it "builds (but doesn't save) all the posts" do
+      subject.each do |record|
+        record.should be_new_record
+      end
+    end
+
+    it "uses the default factory values" do
+      subject.each do |record|
+        record.title.should == "Through the Looking Glass"
+      end
+    end
+  end
+
+  context "with default attributes" do
+    subject { FactoryGirl.build_list(:post, 20, :title => "The Hunting of the Snark") }
+
+    it "overrides the default values" do
+      subject.each do |record|
+        record.title.should == "The Hunting of the Snark"
+      end
+    end
+  end
+end

data/spec/acceptance/create_list_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'acceptance/acceptance_helper'
+
+describe "create multiple instances" do
+  before do
+    define_model('Post', :title => :string)
+
+    FactoryGirl.define do
+      factory(:post) do |post|
+        post.title "Through the Looking Glass"
+      end
+    end
+  end
+
+  context "without default attributes" do
+    subject { FactoryGirl.create_list(:post, 20) }
+
+    its(:length) { should == 20 }
+
+    it "creates all the posts" do
+      subject.each do |record|
+        record.should_not be_new_record
+      end
+    end
+
+    it "uses the default factory values" do
+      subject.each do |record|
+        record.title.should == "Through the Looking Glass"
+      end
+    end
+  end
+
+  context "with default attributes" do
+    subject { FactoryGirl.create_list(:post, 20, :title => "The Hunting of the Snark") }
+
+    it "overrides the default values" do
+      subject.each do |record|
+        record.title.should == "The Hunting of the Snark"
+      end
+    end
+  end
+end

data/spec/acceptance/sequence_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 require 'acceptance/acceptance_helper'
 
 describe "sequences" do
+  include FactoryGirl::Syntax::Methods
+
   it "generates several values in the correct format" do
     FactoryGirl.define do
       sequence :email do |n|
@@ -9,8 +11,8 @@ describe "sequences" do
       end
     end
 
-    first_value = FactoryGirl.create(:email)
-    another_value = FactoryGirl.create(:email)
+    first_value = generate(:email)
+    another_value = generate(:email)
 
     first_value.should =~ /^somebody\d+@example\.com$/
     another_value.should =~ /^somebody\d+@example\.com$/
@@ -22,8 +24,8 @@ describe "sequences" do
       sequence :order
     end
 
-    first_value = FactoryGirl.create(:order)
-    another_value = FactoryGirl.create(:order)
+    first_value = generate(:order)
+    another_value = generate(:order)
 
     first_value.should == 1
     another_value.should == 2

data/spec/acceptance/syntax/blueprint_spec.rb

@@ -9,9 +9,9 @@ describe "a blueprint" do
 
     Factory.sequence(:email) { |n| "somebody#{n}@example.com" }
     User.blueprint do
-      first_name { 'Bill'                     }
-      last_name  { 'Nye'                      }
-      email      { FactoryGirl.create(:email) }
+      first_name { 'Bill'                       }
+      last_name  { 'Nye'                        }
+      email      { FactoryGirl.generate(:email) }
     end
   end
 

data/spec/acceptance/syntax/make_spec.rb

@@ -15,7 +15,7 @@ describe "a factory using make syntax" do
     end
   end
 
-  describe "after making an instance" do
+  describe "after make" do
     before do
       @instance = User.make(:last_name => 'Rye')
     end
@@ -28,6 +28,24 @@ describe "a factory using make syntax" do
       @instance.last_name.should == 'Rye'
     end
 
+    it "should build the record" do
+      @instance.should be_new_record
+    end
+  end
+
+  describe "after make!" do
+    before do
+      @instance = User.make!(:last_name => 'Rye')
+    end
+
+    it "should use attributes from the factory" do
+      @instance.first_name.should == 'Bill'
+    end
+
+    it "should use attributes passed to make" do
+      @instance.last_name.should == 'Rye'
+    end
+
     it "should save the record" do
       @instance.should_not be_new_record
     end

data/spec/acceptance/syntax/vintage_spec.rb

@@ -11,7 +11,7 @@ describe "vintage syntax" do
     Factory.define :user do |factory|
       factory.first_name { 'Bill'               }
       factory.last_name  { 'Nye'                }
-      factory.email      { Factory(:email) }
+      factory.email      { Factory.next(:email) }
     end
   end
 
@@ -51,7 +51,7 @@ describe Factory, "given a parent factory" do
   before do
     @parent = FactoryGirl::Factory.new(:object)
     @parent.define_attribute(FactoryGirl::Attribute::Static.new(:name, 'value'))
-    FactoryGirl.register(@parent)
+    FactoryGirl.register_factory(@parent)
   end
 
   it "should raise an ArgumentError when trying to use a non-existent factory as parent" do
@@ -87,7 +87,7 @@ describe "defining a factory" do
 
   it "should add the factory to the list of factories" do
     Factory.define(@name) {|f| }
-    @factory.should == FactoryGirl.find(@name)
+    @factory.should == FactoryGirl.factory_by_name(@name)
   end
 end
 
@@ -96,7 +96,7 @@ describe "after defining a factory" do
     @name    = :user
     @factory = FactoryGirl::Factory.new(@name)
 
-    FactoryGirl.register(@factory)
+    FactoryGirl.register_factory(@factory)
   end
 
   it "should use Proxy::AttributesFor for Factory.attributes_for" do

data/spec/factory_girl/attribute/association_spec.rb

@@ -12,6 +12,10 @@ describe FactoryGirl::Attribute::Association do
     @attr.name.should == @name
   end
 
+  it "is an association" do
+    @attr.should be_association
+  end
+
   it "should have a factory" do
     @attr.factory.should == @factory
   end

data/spec/factory_girl/attribute/implicit_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe FactoryGirl::Attribute::Implicit do
+  before do
+    @name       = :author
+    @attr       = FactoryGirl::Attribute::Implicit.new(@name)
+  end
+
+  it "has a name" do
+    @attr.name.should == @name
+  end
+
+  context "with a known factory" do
+    before do
+      stub(FactoryGirl.factories).registered? { true }
+    end
+
+    it "associates the factory" do
+      proxy = "proxy"
+      stub(proxy).associate
+      @attr.add_to(proxy)
+      proxy.should have_received.associate(@name, @name, {})
+    end
+
+    it "is an association" do
+      @attr.should be_association
+    end
+
+    it "has a factory" do
+      @attr.factory.should == @name
+    end
+  end
+
+  context "with a known sequence" do
+    before do
+      FactoryGirl.register_sequence(FactoryGirl::Sequence.new(@name, 1) { "magic" })
+    end
+
+    it "generates the sequence" do
+      proxy = "proxy"
+      stub(proxy).set
+      @attr.add_to(proxy)
+      proxy.should have_received.set(@name, "magic")
+    end
+
+    it "isn't an association" do
+      @attr.should_not be_association
+    end
+  end
+end

data/spec/factory_girl/attribute/sequence_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe FactoryGirl::Attribute::Sequence do
+  before do
+    @name     = :first_name
+    @sequence = :name
+    FactoryGirl.register_sequence(FactoryGirl::Sequence.new(@sequence, 5) { |n| "Name #{n}" })
+    @attr  = FactoryGirl::Attribute::Sequence.new(@name, @sequence)
+  end
+
+  it "should have a name" do
+    @attr.name.should == @name
+  end
+
+  it "assigns the next value in the sequence" do
+    proxy = "proxy"
+    stub(proxy).set
+    @attr.add_to(proxy)
+    proxy.should have_received.set(@name, "Name 5")
+  end
+end

data/spec/factory_girl/attribute_spec.rb

@@ -10,6 +10,10 @@ describe FactoryGirl::Attribute do
     @attr.name.should == @name
   end
 
+  it "isn't an association" do
+    @attr.should_not be_association
+  end
+
   it "should do nothing when being added to a proxy" do
     @proxy = "proxy"
     stub(@proxy).set

data/spec/factory_girl/definition_proxy_spec.rb

@@ -111,22 +111,11 @@ describe FactoryGirl::DefinitionProxy do
     factory.attributes.should include(attribute)
   end
 
-  it "adds an association when passed an undefined method without arguments or a block" do
+  it "adds an implicit attribute when passed an undefined method without arguments or a block" do
     name = :user
-    FactoryGirl.register(FactoryGirl::Factory.new(name))
     attr = 'attribute'
     stub(attr).name { name }
-    mock(FactoryGirl::Attribute::Association).new(name, name, {}) { attr }
-    subject.send(name)
-    factory.attributes.should include(attr)
-  end
-
-  it "adds a sequence when passed an undefined method without arguments or a block" do
-    name = :airport
-    FactoryGirl.register(FactoryGirl::Sequence.new(name))
-    attr = 'attribute'
-    stub(attr).name { name }
-    mock(FactoryGirl::Attribute::Association).new(name, name, {}) { attr }
+    mock(FactoryGirl::Attribute::Implicit).new(name) { attr }
     subject.send(name)
     factory.attributes.should include(attr)
   end

data/spec/factory_girl/factory_spec.rb

@@ -89,12 +89,14 @@ describe FactoryGirl::Factory do
 
   it "should return associations" do
     factory = FactoryGirl::Factory.new(:post)
+    FactoryGirl.register_factory(FactoryGirl::Factory.new(:admin))
     factory.define_attribute(FactoryGirl::Attribute::Association.new(:author, :author, {}))
     factory.define_attribute(FactoryGirl::Attribute::Association.new(:editor, :editor, {}))
+    factory.define_attribute(FactoryGirl::Attribute::Implicit.new(:admin))
     factory.associations.each do |association|
-      association.should be_a(FactoryGirl::Attribute::Association)
+      association.should be_association
     end
-    factory.associations.size.should == 2
+    factory.associations.size.should == 3
   end
 
   it "should raise for a self referencing association" do

data/spec/factory_girl/find_definitions_spec.rb

@@ -96,5 +96,14 @@ describe "definition loading" do
         it { should require_definitions_from("#{dir}/factories/person_factory.rb") }
       end
     end
+
+    describe "with deeply nested factory files under #{dir}" do
+      in_directory_with_files File.join(dir, 'factories', 'subdirectory', 'post_factory.rb'),
+                              File.join(dir, 'factories', 'subdirectory', 'person_factory.rb')
+      it_should_behave_like "finds definitions" do
+        it { should require_definitions_from("#{dir}/factories/subdirectory/post_factory.rb") }
+        it { should require_definitions_from("#{dir}/factories/subdirectory/person_factory.rb") }
+      end
+    end
   end
 end

data/spec/factory_girl/proxy/build_spec.rb

@@ -21,7 +21,7 @@ describe FactoryGirl::Proxy::Build do
     before do
       @association = "associated-instance"
       @associated_factory = "associated-factory"
-      stub(FactoryGirl).find { @associated_factory }
+      stub(FactoryGirl).factory_by_name { @associated_factory }
       stub(@associated_factory).run { @association }
       @overrides = { 'attr' => 'value' }
       @proxy.associate(:owner, :user, @overrides)
@@ -39,7 +39,7 @@ describe FactoryGirl::Proxy::Build do
   it "should run create when building an association" do
     association = "associated-instance"
     associated_factory = "associated-factory"
-    stub(FactoryGirl).find { associated_factory }
+    stub(FactoryGirl).factory_by_name { associated_factory }
     stub(associated_factory).run { association }
     overrides = { 'attr' => 'value' }
     @proxy.association(:user, overrides).should == association

data/spec/factory_girl/proxy/create_spec.rb

@@ -22,7 +22,7 @@ describe FactoryGirl::Proxy::Create do
     before do
       @association = "associated-instance"
       @associated_factory = "associated-factory"
-      stub(FactoryGirl).find { @associated_factory }
+      stub(FactoryGirl).factory_by_name { @associated_factory }
       stub(@associated_factory).run { @association }
       @overrides = { 'attr' => 'value' }
       @proxy.associate(:owner, :user, @overrides)
@@ -40,7 +40,7 @@ describe FactoryGirl::Proxy::Create do
   it "should run create when building an association" do
     association = "associated-instance"
     associated_factory = "associated-factory"
-    stub(FactoryGirl).find { associated_factory }
+    stub(FactoryGirl).factory_by_name { associated_factory }
     stub(associated_factory).run { association }
     overrides = { 'attr' => 'value' }
     @proxy.association(:user, overrides).should == association

data/spec/factory_girl/proxy/stub_spec.rb

@@ -16,6 +16,10 @@ describe FactoryGirl::Proxy::Stub do
     @stub.result(nil).should_not be_new_record
   end
 
+  it "should be persisted" do
+    @stub.result(nil).should be_persisted
+  end
+
   it "should not be able to connect to the database" do
     lambda { @stub.result(nil).reload }.should raise_error(RuntimeError)
   end
@@ -23,7 +27,7 @@ describe FactoryGirl::Proxy::Stub do
   describe "when a user factory exists" do
     before do
       @user = "user"
-      stub(FactoryGirl).find { @associated_factory }
+      stub(FactoryGirl).factory_by_name { @associated_factory }
       @associated_factory = 'associate-factory'
     end
 

data/spec/factory_girl/registry_spec.rb

@@ -41,14 +41,13 @@ describe FactoryGirl::Registry do
     other_factory = FactoryGirl::Factory.new(:string)
     subject.add(factory)
     subject.add(other_factory)
-    result = {}
+    result = []
 
-    subject.each do |name, value|
-      result[name] = value
+    subject.each do |value|
+      result << value
     end
 
-    result.should == { factory.name       => factory,
-                       other_factory.name => other_factory }
+    result.should =~ [factory, other_factory]
   end
 
   it "registers an sequence" do
@@ -71,22 +70,14 @@ describe FactoryGirl::Registry do
     end
   end
 
-  context "on the FactoryGirl module" do
-    it "finds a registered a factory" do
-      FactoryGirl.register(factory)
-      FactoryGirl.find(factory.name).should == factory
-    end
-
-    it "knows that a factory is registered by symbol" do
-      FactoryGirl.register(factory)
-      FactoryGirl.should be_registered(factory.name.to_sym)
-    end
+  it "is enumerable" do
+    should be_kind_of(Enumerable)
+  end
 
-    it "sets the registry" do
-      registry = FactoryGirl::Registry.new
-      FactoryGirl.registry = registry
-      FactoryGirl.registry.should == registry
-    end
+  it "clears registered factories" do
+    subject.add(factory)
+    subject.clear
+    subject.count.should == 0
   end
 end