factory_girl 2.0.5 → 2.1.0

data/spec/factory_girl/attribute_list_spec.rb

@@ -1,5 +1,14 @@
 require "spec_helper"
 
+describe FactoryGirl::AttributeList, "overridable" do
+  it { should_not be_overridable }
+
+  it "can set itself as overridable" do
+    subject.overridable
+    subject.should be_overridable
+  end
+end
+
 describe FactoryGirl::AttributeList, "#define_attribute" do
   let(:static_attribute)  { FactoryGirl::Attribute::Static.new(:full_name, "value") }
   let(:dynamic_attribute) { FactoryGirl::Attribute::Dynamic.new(:email, lambda {|u| "#{u.full_name}@example.com" }) }
@@ -22,6 +31,18 @@ describe FactoryGirl::AttributeList, "#define_attribute" do
       2.times { subject.define_attribute(static_attribute) }
     }.to raise_error(FactoryGirl::AttributeDefinitionError, "Attribute already defined: full_name")
   end
+
+  context "when set as overridable" do
+    let(:static_attribute_with_same_name) { FactoryGirl::Attribute::Static.new(:full_name, "overridden value") }
+    before { subject.overridable }
+
+    it "redefines the attribute if the name already exists" do
+      subject.define_attribute(static_attribute)
+      subject.define_attribute(static_attribute_with_same_name)
+
+      subject.to_a.should == [static_attribute_with_same_name]
+    end
+  end
 end
 
 describe FactoryGirl::AttributeList, "#attribute_defined?" do
@@ -109,11 +130,42 @@ describe FactoryGirl::AttributeList, "#apply_attributes" do
     subject.to_a.should == [city_attribute, full_name_attribute, email_attribute, login_attribute]
   end
 
-  it "overwrites attributes that are already defined" do
+  it "doesn't overwrite attributes that are already defined" do
     subject.define_attribute(full_name_attribute)
     attribute_with_same_name = FactoryGirl::Attribute::Static.new(:full_name, "Benjamin Franklin")
 
     subject.apply_attributes([attribute_with_same_name])
-    subject.to_a.should == [attribute_with_same_name]
+    subject.to_a.should == [full_name_attribute]
+  end
+
+  context "when set as overridable" do
+    before { subject.overridable }
+
+    it "prepends applied attributes" do
+      subject.define_attribute(full_name_attribute)
+      subject.apply_attributes([city_attribute])
+      subject.to_a.should == [city_attribute, full_name_attribute]
+    end
+
+    it "moves non-static attributes to the end of the list" do
+      subject.define_attribute(full_name_attribute)
+      subject.apply_attributes([city_attribute, email_attribute])
+      subject.to_a.should == [city_attribute, full_name_attribute, email_attribute]
+    end
+
+    it "maintains order of non-static attributes" do
+      subject.define_attribute(full_name_attribute)
+      subject.define_attribute(login_attribute)
+      subject.apply_attributes([city_attribute, email_attribute])
+      subject.to_a.should == [city_attribute, full_name_attribute, email_attribute, login_attribute]
+    end
+
+    it "overwrites attributes that are already defined" do
+      subject.define_attribute(full_name_attribute)
+      attribute_with_same_name = FactoryGirl::Attribute::Static.new(:full_name, "Benjamin Franklin")
+
+      subject.apply_attributes([attribute_with_same_name])
+      subject.to_a.should == [attribute_with_same_name]
+    end
   end
 end

data/spec/factory_girl/factory_spec.rb

@@ -308,15 +308,17 @@ describe FactoryGirl::Factory, "human names" do
 end
 
 describe FactoryGirl::Factory, "running a factory" do
-  subject             { FactoryGirl::Factory.new(:user) }
-  let(:attribute)     { stub("attribute", :name => :name, :ignored => false, :add_to => nil, :aliases_for? => true) }
-  let(:proxy)         { stub("proxy", :result => "result", :set => nil) }
+  subject              { FactoryGirl::Factory.new(:user) }
+  let(:attribute)      { stub("attribute", :name => :name, :ignored => false, :add_to => nil, :aliases_for? => true) }
+  let(:attribute_list) { [attribute] }
+  let(:proxy)          { stub("proxy", :result => "result", :set => nil) }
 
   before do
     define_model("User", :name => :string)
     FactoryGirl::Attribute::Static.stubs(:new => attribute)
     FactoryGirl::Proxy::Build.stubs(:new => proxy)
-    FactoryGirl::AttributeList.stubs(:new => [attribute])
+    attribute_list.stubs(:apply_attributes)
+    FactoryGirl::AttributeList.stubs(:new => attribute_list)
   end
 
   it "creates the right proxy using the build class when running" do

data/spec/factory_girl/proxy/build_spec.rb

@@ -9,4 +9,28 @@ describe FactoryGirl::Proxy::Build do
   it_should_behave_like "proxy with association support", FactoryGirl::Proxy::Create
   it_should_behave_like "proxy with standard getters and setters", :attribute_name, "attribute value!"
   it_should_behave_like "proxy with callbacks", :after_build
+  it_should_behave_like "proxy with :method => :build",
+    FactoryGirl::Proxy::Build
+
+  describe "specifying method" do
+    it "defaults to create" do
+      subject.send(:get_method, nil).should == FactoryGirl::Proxy::Create
+    end
+
+    it "can specify create explicitly" do
+      subject.send(:get_method, :create).should ==
+        FactoryGirl::Proxy::Create
+    end
+
+    it "can specify build explicitly" do
+      subject.send(:get_method, :build).should ==
+        FactoryGirl::Proxy::Build
+    end
+
+    it "complains if method is unrecognized" do
+      lambda { subject.send(:get_method, :froboznicate) }.
+        should raise_error("unrecognized method froboznicate")
+    end
+  end
+
 end

data/spec/factory_girl/proxy/stub_spec.rb

@@ -9,11 +9,25 @@ describe FactoryGirl::Proxy::Stub do
   it_should_behave_like "proxy with association support", FactoryGirl::Proxy::Stub
   it_should_behave_like "proxy with standard getters and setters", :attribute_name, "attribute value!"
   it_should_behave_like "proxy with callbacks", :after_stub
+  it_should_behave_like "proxy with :method => :build",
+    FactoryGirl::Proxy::Stub
 
   context "asking for a result" do
+    before { Timecop.freeze(Time.now) }
+    after  { Timecop.return }
+
     it { subject.result(nil).should_not be_new_record }
     it { subject.result(nil).should be_persisted }
 
+    it "assigns created_at" do
+      created_at = subject.result(nil).created_at
+      created_at.should == Time.now
+
+      Timecop.travel(150000)
+
+      subject.result(nil).created_at.should == created_at
+    end
+
     [:save, :destroy, :connection, :reload, :update_attribute].each do |database_method|
       it "raises when attempting to connect to the database by calling #{database_method}" do
         expect do

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'rspec/autorun'
 require 'factory_girl'
 require "mocha"
 require "bourne"
+require "timecop"
 
 Dir["spec/support/**/*.rb"].each { |f| require File.expand_path(f) }
 

data/spec/support/shared_examples/proxy.rb

@@ -49,6 +49,35 @@ shared_examples_for "proxy with association support" do |factory_girl_proxy_clas
   end
 end
 
+shared_examples_for "proxy with :method => :build" do |factory_girl_proxy_class|
+  let(:factory_name)     { :user }
+  let(:association_name) { :owner }
+  let(:factory)          { stub("associate_factory") }
+  let(:overrides)        { { :method => :build } }
+
+  before do
+    FactoryGirl.stubs(:factory_by_name => factory)
+    instance.stubs(association_name => factory_name)
+    factory.stubs(:run => factory_name)
+    subject.stubs(:set)
+  end
+
+  it "sets a value for the association" do
+    subject.associate(association_name, factory_name, overrides)
+    subject.result(nil).send(association_name).should == factory_name
+  end
+
+  it "sets the association attribute as the factory" do
+    subject.associate(association_name, factory_name, overrides)
+    subject.should have_received(:set).with(association_name, factory_name)
+  end
+
+  it "runs the factory with the correct proxy class" do
+    subject.associate(association_name, factory_name, overrides)
+    factory.should have_received(:run).with(factory_girl_proxy_class, {})
+  end
+end
+
 shared_examples_for "proxy with standard getters and setters" do |attribute, value|
   before do
     instance.stubs(:"#{attribute}=" => value, :"#{attribute}" => value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-24 00:00:00.000000000 -04:00
+date: 2011-09-02 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &2152571280 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &2156798340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2152571280
+  version_requirements: *2156798340
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2152570480 !ruby/object:Gem::Requirement
+  name: cucumber
+  requirement: &2156797700 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152570480
+  version_requirements: *2156797700
 - !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: &2152560340 !ruby/object:Gem::Requirement
+  name: timecop
+  requirement: &2156797320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,32 +44,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152560340
+  version_requirements: *2156797320
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &2152558860 !ruby/object:Gem::Requirement
+  name: rcov
+  requirement: &2156796800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152558860
+  version_requirements: *2156796800
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &2152554140 !ruby/object:Gem::Requirement
+  name: aruba
+  requirement: &2156796320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta3
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152554140
+  version_requirements: *2156796320
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152553560 !ruby/object:Gem::Requirement
+  requirement: &2156795900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152553560
+  version_requirements: *2156795900
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &2152544280 !ruby/object:Gem::Requirement
+  requirement: &2156795340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156795340
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: &2156794720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.8
+  type: :development
+  prerelease: false
+  version_requirements: *2156794720
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: &2156794240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152544280
+  version_requirements: *2156794240
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &2152541940 !ruby/object:Gem::Requirement
+  name: yard
+  requirement: &2156793760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152541940
+  version_requirements: *2156793760
 - !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: &2152541220 !ruby/object:Gem::Requirement
+  name: bluecloth
+  requirement: &2156793260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +132,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152541220
+  version_requirements: *2156793260
 description: ! "factory_girl provides a framework and DSL for defining and\n                       using
   factories - less error-prone, more explicit, and\n                       all-around
   easier to work with than fixtures."
@@ -119,16 +141,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Appraisals
-- Changelog
+- .autotest
+- .gitignore
+- .rspec
+- .travis.yml
+- .yardopts
 - CONTRIBUTION_GUIDELINES.md
+- Changelog
+- GETTING_STARTED.md
 - Gemfile
 - Gemfile.lock
-- GETTING_STARTED.md
 - LICENSE
-- Rakefile
 - README.md
+- Rakefile
+- lib/factory_girl.rb
 - lib/factory_girl/aliases.rb
+- lib/factory_girl/attribute.rb
 - lib/factory_girl/attribute/association.rb
 - lib/factory_girl/attribute/callback.rb
 - lib/factory_girl/attribute/dynamic.rb
@@ -136,21 +164,22 @@ files:
 - lib/factory_girl/attribute/sequence.rb
 - lib/factory_girl/attribute/static.rb
 - lib/factory_girl/attribute/trait.rb
-- lib/factory_girl/attribute.rb
 - lib/factory_girl/attribute_list.rb
 - lib/factory_girl/definition_proxy.rb
 - lib/factory_girl/deprecated.rb
 - lib/factory_girl/factory.rb
 - lib/factory_girl/find_definitions.rb
+- lib/factory_girl/proxy.rb
 - lib/factory_girl/proxy/attributes_for.rb
 - lib/factory_girl/proxy/build.rb
 - lib/factory_girl/proxy/create.rb
 - lib/factory_girl/proxy/stub.rb
-- lib/factory_girl/proxy.rb
 - lib/factory_girl/rails2.rb
 - lib/factory_girl/registry.rb
+- lib/factory_girl/reload.rb
 - lib/factory_girl/sequence.rb
 - lib/factory_girl/step_definitions.rb
+- lib/factory_girl/syntax.rb
 - lib/factory_girl/syntax/blueprint.rb
 - lib/factory_girl/syntax/default.rb
 - lib/factory_girl/syntax/generate.rb
@@ -158,10 +187,24 @@ files:
 - lib/factory_girl/syntax/methods.rb
 - lib/factory_girl/syntax/sham.rb
 - lib/factory_girl/syntax/vintage.rb
-- lib/factory_girl/syntax.rb
 - lib/factory_girl/trait.rb
 - lib/factory_girl/version.rb
-- lib/factory_girl.rb
+- Appraisals
+- cucumber.yml
+- features/factory_girl_steps.feature
+- features/find_definitions.feature
+- features/step_definitions/database_steps.rb
+- features/step_definitions/factory_girl_steps.rb
+- features/support/env.rb
+- features/support/factories.rb
+- gemfiles/2.1.gemfile
+- gemfiles/2.1.gemfile.lock
+- gemfiles/2.3.gemfile
+- gemfiles/2.3.gemfile.lock
+- gemfiles/3.0.gemfile
+- gemfiles/3.0.gemfile.lock
+- gemfiles/3.1.gemfile
+- gemfiles/3.1.gemfile.lock
 - spec/acceptance/attribute_aliases_spec.rb
 - spec/acceptance/attributes_for_spec.rb
 - spec/acceptance/attributes_ordered_spec.rb
@@ -174,9 +217,11 @@ files:
 - spec/acceptance/default_strategy_spec.rb
 - spec/acceptance/definition_spec.rb
 - spec/acceptance/definition_without_block_spec.rb
+- spec/acceptance/modify_factories_spec.rb
 - spec/acceptance/overrides_spec.rb
 - spec/acceptance/parent_spec.rb
 - spec/acceptance/sequence_spec.rb
+- spec/acceptance/stub_spec.rb
 - spec/acceptance/syntax/blueprint_spec.rb
 - spec/acceptance/syntax/generate_spec.rb
 - spec/acceptance/syntax/make_spec.rb
@@ -208,13 +253,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/macros/define_constant.rb
 - spec/support/shared_examples/proxy.rb
-- features/factory_girl_steps.feature
-- features/find_definitions.feature
-- features/step_definitions/database_steps.rb
-- features/step_definitions/factory_girl_steps.rb
-- features/support/env.rb
-- features/support/factories.rb
-- features/support/test.db
 has_rdoc: true
 homepage: https://github.com/thoughtbot/factory_girl
 licenses: []
@@ -242,6 +280,22 @@ specification_version: 3
 summary: factory_girl provides a framework and DSL for defining and using model instance
   factories.
 test_files:
+- Appraisals
+- cucumber.yml
+- features/factory_girl_steps.feature
+- features/find_definitions.feature
+- features/step_definitions/database_steps.rb
+- features/step_definitions/factory_girl_steps.rb
+- features/support/env.rb
+- features/support/factories.rb
+- gemfiles/2.1.gemfile
+- gemfiles/2.1.gemfile.lock
+- gemfiles/2.3.gemfile
+- gemfiles/2.3.gemfile.lock
+- gemfiles/3.0.gemfile
+- gemfiles/3.0.gemfile.lock
+- gemfiles/3.1.gemfile
+- gemfiles/3.1.gemfile.lock
 - spec/acceptance/attribute_aliases_spec.rb
 - spec/acceptance/attributes_for_spec.rb
 - spec/acceptance/attributes_ordered_spec.rb
@@ -254,9 +308,11 @@ test_files:
 - spec/acceptance/default_strategy_spec.rb
 - spec/acceptance/definition_spec.rb
 - spec/acceptance/definition_without_block_spec.rb
+- spec/acceptance/modify_factories_spec.rb
 - spec/acceptance/overrides_spec.rb
 - spec/acceptance/parent_spec.rb
 - spec/acceptance/sequence_spec.rb
+- spec/acceptance/stub_spec.rb
 - spec/acceptance/syntax/blueprint_spec.rb
 - spec/acceptance/syntax/generate_spec.rb
 - spec/acceptance/syntax/make_spec.rb
@@ -285,10 +341,6 @@ test_files:
 - spec/factory_girl/registry_spec.rb
 - spec/factory_girl/sequence_spec.rb
 - spec/factory_girl_spec.rb
-- features/factory_girl_steps.feature
-- features/find_definitions.feature
-- features/step_definitions/database_steps.rb
-- features/step_definitions/factory_girl_steps.rb
-- features/support/env.rb
-- features/support/factories.rb
-- features/support/test.db
+- spec/spec_helper.rb
+- spec/support/macros/define_constant.rb
+- spec/support/shared_examples/proxy.rb