factory_girl 2.1.2 → 2.2.0

data/spec/factory_girl/factory_spec.rb

@@ -5,9 +5,10 @@ describe FactoryGirl::Factory do
     @name    = :user
     @class   = define_class('User')
     @factory = FactoryGirl::Factory.new(@name)
+    FactoryGirl.register_factory(@factory)
   end
 
-  it "should have a factory name" do
+  it "has a factory name" do
     @factory.name.should == @name
   end
 
@@ -15,11 +16,11 @@ describe FactoryGirl::Factory do
     @factory.factory_name.should == @name
   end
 
-  it "should have a build class" do
+  it "has a build class" do
     @factory.build_class.should == @class
   end
 
-  it "should have a default strategy" do
+  it "has a default strategy" do
     @factory.default_strategy.should == :create
   end
 
@@ -35,7 +36,7 @@ describe FactoryGirl::Factory do
     proxy.should have_received(:result).with(block)
   end
 
-  it "should return associations" do
+  it "returns associations" do
     factory = FactoryGirl::Factory.new(:post)
     FactoryGirl.register_factory(FactoryGirl::Factory.new(:admin))
     factory.declare_attribute(FactoryGirl::Declaration::Association.new(:author, {}))
@@ -47,11 +48,11 @@ describe FactoryGirl::Factory do
     factory.associations.size.should == 3
   end
 
-  it "should raise for a self referencing association" do
+  it "raises for a self referencing association" do
     factory = FactoryGirl::Factory.new(:post)
     lambda {
       factory.declare_attribute(FactoryGirl::Declaration::Association.new(:parent, { :factory => :post }))
-      factory.attributes
+      factory.ensure_compiled
     }.should raise_error(FactoryGirl::AssociationDefinitionError)
   end
 
@@ -62,20 +63,20 @@ describe FactoryGirl::Factory do
       @hash  = { @name => @value }
     end
 
-    it "should return the overridden value in the generated attributes" do
+    it "returns the overridden value in the generated attributes" do
       declaration = FactoryGirl::Declaration::Static.new(@name, 'The price is wrong, Bob!')
       @factory.declare_attribute(declaration)
       result = @factory.run(FactoryGirl::Proxy::AttributesFor, @hash)
       result[@name].should == @value
     end
 
-    it "should not call a lazy attribute block for an overridden attribute" do
+    it "does not call a lazy attribute block for an overridden attribute" do
       declaration = FactoryGirl::Declaration::Dynamic.new(@name, lambda { flunk })
       @factory.declare_attribute(declaration)
       result = @factory.run(FactoryGirl::Proxy::AttributesFor, @hash)
     end
 
-    it "should override a symbol parameter with a string parameter" do
+    it "overrides a symbol parameter with a string parameter" do
       declaration = FactoryGirl::Declaration::Static.new(@name, 'The price is wrong, Bob!')
       @factory.declare_attribute(declaration)
       @hash = { @name.to_s => @value }
@@ -92,85 +93,30 @@ describe FactoryGirl::Factory do
                              :test_alias => 'new')
     end
 
-    it "should use the passed in value for the alias" do
+    it "uses the passed in value for the alias" do
       @result[:test_alias].should == 'new'
     end
 
-    it "should discard the predefined value for the attribute" do
+    it "discards the predefined value for the attribute" do
       @result[:test].should be_nil
     end
   end
 
-  it "should guess the build class from the factory name" do
+  it "guesses the build class from the factory name" do
     @factory.build_class.should == User
   end
 
-  it "should create a new factory using the class of the parent" do
-    child = FactoryGirl::Factory.new(:child)
-    child.inherit_factory(@factory)
+  it "creates a new factory using the class of the parent" do
+    child = FactoryGirl::Factory.new(:child, :parent => @factory.name)
+    child.ensure_compiled
     child.build_class.should == @factory.build_class
   end
 
-  it "should create a new factory while overriding the parent class" do
-    child = FactoryGirl::Factory.new(:child, :class => String)
-    child.inherit_factory(@factory)
+  it "creates a new factory while overriding the parent class" do
+    child = FactoryGirl::Factory.new(:child, :class => String, :parent => @factory.name)
+    child.ensure_compiled
     child.build_class.should == String
   end
-
-  describe "given a parent with attributes" do
-    before do
-      @parent_attr = :name
-      @factory.declare_attribute(FactoryGirl::Declaration::Static.new(@parent_attr, 'value'))
-    end
-
-    it "should create a new factory with attributes of the parent" do
-      child = FactoryGirl::Factory.new(:child)
-      child.inherit_factory(@factory)
-      child.attributes.size.should == 1
-      child.attributes.first.name.should == @parent_attr
-    end
-
-    it "should allow a child to define additional attributes" do
-      child = FactoryGirl::Factory.new(:child)
-      child.declare_attribute(FactoryGirl::Declaration::Static.new(:email, 'value'))
-      child.inherit_factory(@factory)
-      child.attributes.size.should == 2
-    end
-
-    it "should allow to override parent attributes" do
-      child = FactoryGirl::Factory.new(:child)
-      @child_declaration = FactoryGirl::Declaration::Static.new(@parent_attr, 'overridden')
-      child.declare_attribute(@child_declaration)
-      child.inherit_factory(@factory)
-      child.attributes.size.should == 1
-      child.attributes.first.should == @child_declaration.to_attributes.first
-    end
-
-    it "should allow to use parent attributes in defining additional attributes" do
-      User.class_eval { attr_accessor :name, :email }
-
-      child = FactoryGirl::Factory.new(:child)
-      @child_declaration = FactoryGirl::Declaration::Dynamic.new(:email, lambda {|u| "#{u.name}@example.com"})
-      child.declare_attribute(@child_declaration)
-      child.inherit_factory(@factory)
-      child.attributes.size.should == 2
-
-      result = child.run(FactoryGirl::Proxy::Build, {})
-      result.email.should == 'value@example.com'
-    end
-  end
-
-  it "inherits callbacks" do
-    @factory.add_callback(:after_stub) { |object| object.name = 'Stubby' }
-    child = FactoryGirl::Factory.new(:child)
-    child.inherit_factory(@factory)
-    child.callbacks.should_not be_empty
-  end
-
-  it "compiles when looking for attributes" do
-    @factory.declare_attribute(FactoryGirl::Declaration::Static.new("name", "value"))
-    @factory.attributes.size.should == 1
-  end
 end
 
 describe FactoryGirl::Factory, "when defined with a custom class" do
@@ -245,17 +191,10 @@ describe FactoryGirl::Factory do
     FactoryGirl::Factory.new(:object, :default_strategy => :stub)
   end
 
-  let(:factory_without_strategy) do
-    FactoryGirl::Factory.new(:other_object)
-  end
-
-  let(:factory_with_build_strategy) do
-    FactoryGirl::Factory.new(:other_object, :default_strategy => :build)
-  end
-
   before do
     define_class("User")
     define_class("Admin", User)
+    FactoryGirl.register_factory(factory_with_stub_strategy)
   end
 
   it "raises an ArgumentError when trying to use a non-existent strategy" do
@@ -267,12 +206,8 @@ describe FactoryGirl::Factory do
   end
 
   describe "defining a child factory without setting default strategy" do
-    let(:parent) { factory_with_stub_strategy }
-    subject      { factory_without_strategy }
-
-    before do
-      subject.inherit_factory(parent)
-    end
+    subject { FactoryGirl::Factory.new(:other_object, :parent => factory_with_stub_strategy.name) }
+    before  { subject.ensure_compiled }
 
     it "inherits default strategy from its parent" do
       subject.default_strategy.should == :stub
@@ -280,12 +215,8 @@ describe FactoryGirl::Factory do
   end
 
   describe "defining a child factory with a default strategy" do
-    let(:parent) { factory_with_stub_strategy }
-    subject      { factory_with_build_strategy }
-
-    before do
-      subject.inherit_factory(parent)
-    end
+    subject { FactoryGirl::Factory.new(:other_object, :default_strategy => :build, :parent => factory_with_stub_strategy.name) }
+    before  { subject.ensure_compiled }
 
     it "overrides the default strategy from parent" do
       subject.default_strategy.should == :build
@@ -315,8 +246,8 @@ end
 
 describe FactoryGirl::Factory, "running a factory" do
   subject              { FactoryGirl::Factory.new(:user) }
-  let(:attribute)      { FactoryGirl::Attribute::Static.new(:name, "value") }
-  let(:declaration)    { FactoryGirl::Declaration::Static.new(:name, "value") }
+  let(:attribute)      { FactoryGirl::Attribute::Static.new(:name, "value", false) }
+  let(:declaration)    { FactoryGirl::Declaration::Static.new(:name, "value", false) }
   let(:proxy)          { stub("proxy", :result => "result", :set => nil) }
   let(:attributes)     { [attribute] }
   let(:attribute_list) { stub('attribute-list', :declarations => [declaration], :to_a => attributes) }

data/spec/factory_girl/find_definitions_spec.rb

@@ -78,7 +78,7 @@ describe "definition loading" do
     describe "with several factories files under #{dir}/factories in non-alphabetical order" do
       in_directory_with_files File.join(dir, 'factories', 'b.rb'),
                               File.join(dir, 'factories', 'a.rb')
-      it "should load the files in the right order" do
+      it "loads the files in the right order" do
         FactoryGirl.stubs(:load)
         sorted_load_order = sequence("load order")
         FactoryGirl.expects(:load).with(includes("a.rb")).in_sequence(sorted_load_order)

data/spec/support/shared_examples/proxy.rb

@@ -94,7 +94,7 @@ shared_examples_for "proxy with standard getters and setters" do |attribute, val
 
   describe "when setting an ignored attribute" do
     before do
-      subject.set(attribute, value, true)
+      subject.set_ignored(attribute, value)
     end
 
     it { instance.should have_received(:"#{attribute}=").with(value).never }

metadata

@@ -1,162 +1,157 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: factory_girl
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.2.0
   prerelease: 
-  version: 2.1.2
 platform: ruby
-authors: 
+authors:
 - Joe Ferris
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-23 00:00:00 -04:00
+date: 2011-10-14 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152932580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152932580
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2152931520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2152931520
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &2152928620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: timecop
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2152928620
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: &2152926840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2152926840
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &2152922800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: aruba
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2152922800
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: &2152916020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2152916020
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2152910800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: bourne
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2152910800
+- !ruby/object:Gem::Dependency
+  name: bourne
+  requirement: &2152908620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: appraisal
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2152908620
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: &2152906500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.3.8
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2152906500
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: &2152904880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *2152904880
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2152897180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: bluecloth
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *2152897180
+- !ruby/object:Gem::Dependency
+  name: bluecloth
+  requirement: &2152895440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
-description: |-
-  factory_girl provides a framework and DSL for defining and
-                         using factories - less error-prone, more explicit, and
-                         all-around easier to work with than fixtures.
+  prerelease: false
+  version_requirements: *2152895440
+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."
 email: jferris@thoughtbot.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .autotest
 - .gitignore
 - .rspec
@@ -225,6 +220,7 @@ files:
 - gemfiles/3.1.gemfile
 - gemfiles/3.1.gemfile.lock
 - spec/acceptance/attribute_aliases_spec.rb
+- spec/acceptance/attribute_existing_on_object.rb
 - spec/acceptance/attributes_for_spec.rb
 - spec/acceptance/attributes_ordered_spec.rb
 - spec/acceptance/build_list_spec.rb
@@ -234,6 +230,7 @@ files:
 - spec/acceptance/create_list_spec.rb
 - spec/acceptance/create_spec.rb
 - spec/acceptance/default_strategy_spec.rb
+- spec/acceptance/define_child_before_parent_spec.rb
 - spec/acceptance/definition_spec.rb
 - spec/acceptance/definition_without_block_spec.rb
 - spec/acceptance/modify_factories_spec.rb
@@ -276,32 +273,30 @@ files:
 has_rdoc: true
 homepage: https://github.com/thoughtbot/factory_girl
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: factory_girl provides a framework and DSL for defining and using model instance factories.
-test_files: 
+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
@@ -319,6 +314,7 @@ test_files:
 - gemfiles/3.1.gemfile
 - gemfiles/3.1.gemfile.lock
 - spec/acceptance/attribute_aliases_spec.rb
+- spec/acceptance/attribute_existing_on_object.rb
 - spec/acceptance/attributes_for_spec.rb
 - spec/acceptance/attributes_ordered_spec.rb
 - spec/acceptance/build_list_spec.rb
@@ -328,6 +324,7 @@ test_files:
 - spec/acceptance/create_list_spec.rb
 - spec/acceptance/create_spec.rb
 - spec/acceptance/default_strategy_spec.rb
+- spec/acceptance/define_child_before_parent_spec.rb
 - spec/acceptance/definition_spec.rb
 - spec/acceptance/definition_without_block_spec.rb
 - spec/acceptance/modify_factories_spec.rb