factory_girl 2.0.5 → 2.1.0

data/.autotest

@@ -0,0 +1,9 @@
+Autotest.add_hook :initialize do |at|
+  at.clear_mappings
+
+  at.add_mapping(%r{^test/.*_test\.rb$})              {|f, _| [f] }
+  at.add_mapping(%r{^lib/factory_girl/(.*)\.rb$})     {|_, m| ["test/#{m[1]}_test.rb", 
+                                                               "test/integration_test.rb"] }
+  at.add_mapping(%r{^test/(test_helper|models)\.rb$}) { at.files_matching %r{^test/.*_test\.rb$} }
+  at.add_mapping(%r{^lib/.*\.rb$})                    { at.files_matching %r{^test/.*_test\.rb$} }
+end

data/.gitignore

@@ -0,0 +1,8 @@
+*.swp
+test.db
+factory_girl-*.gem
+doc
+.yardoc
+coverage
+.bundle
+tmp

data/.rspec

@@ -0,0 +1,2 @@
+--format progress
+--color

data/.travis.yml

@@ -0,0 +1,10 @@
+rvm:
+  - ree-1.8.7-2011.03
+  - 1.8.7-p352
+  - 1.9.2-p290
+script: "bundle exec rake spec:unit spec:acceptance features"
+gemfile:
+  - gemfiles/2.1.gemfile
+  - gemfiles/2.3.gemfile
+  - gemfiles/3.0.gemfile
+  - gemfiles/3.1.gemfile

data/.yardopts

@@ -0,0 +1,5 @@
+lib/**/*.rb
+-
+GETTING_STARTED.md
+CONTRIBUTION_GUIDELINES.md
+LICENSE

data/Appraisals

@@ -11,3 +11,6 @@ appraise "3.0" do
   gem "activerecord", "~> 3.0"
 end
 
+appraise "3.1" do
+  gem "activerecord", "~> 3.1"
+end

data/GETTING_STARTED.md

@@ -69,7 +69,7 @@ factory_girl supports several different build strategies: build, create, attribu
     attrs = FactoryGirl.attributes_for(:user)
 
     # Returns an object with all defined attributes stubbed out
-    stub = FactoryGirl.stub(:user)
+    stub = FactoryGirl.build_stubbed(:user)
 
 No matter which strategy is used, it's possible to override the defined attributes by passing a hash:
 
@@ -166,8 +166,8 @@ There may be times where your code can be DRYed up by passing in transient attri
       end
     end
 
-FactoryGirl.create(:user, :upcased => true).name
-# => "JOHN DOE - ROCKSTAR"
+    FactoryGirl.create(:user, :upcased => true).name
+    #=> "JOHN DOE - ROCKSTAR"
 
 Static and dynamic attributes can be ignored. Ignored attributes will be ignored within attributes_for and won't be set on the model, even if the attribute exists or you attempt to override it.
 
@@ -176,7 +176,7 @@ Within Factory Girl's dynamic attributes, you can access ignored attributes as y
 Associations
 ------------
 
-It's possbile to set up associations within factories. If the factory name is the same as the association name, the factory name can be left out.
+It's possible to set up associations within factories. If the factory name is the same as the association name, the factory name can be left out.
 
     factory :post do
       # ...
@@ -194,13 +194,25 @@ The behavior of the association method varies depending on the build strategy us
 
     # Builds and saves a User and a Post
     post = FactoryGirl.create(:post)
-    post.new_record?       # => false
-    post.author.new_record # => false
+    post.new_record?        # => false
+    post.author.new_record? # => false
 
     # Builds and saves a User, and then builds but does not save a Post
     post = FactoryGirl.build(:post)
-    post.new_record?       # => true
-    post.author.new_record # => false
+    post.new_record?        # => true
+    post.author.new_record? # => false
+
+To not save the associated object, specify :method => :build in the factory:
+
+    factory :post do
+      # ...
+      association :author, :factory => :user, :method => :build
+    end
+
+    # Builds a User, and then builds a Post, but does not save either
+    post = FactoryGirl.build(:post)
+    post.new_record?        # => true
+    post.author.new_record? # => true
 
 Inheritance
 -----------
@@ -391,6 +403,53 @@ Calling FactoryGirl.create will invoke both after_build and after_create callbac
 
 Also, like standard attributes, child factories will inherit (and can also define) callbacks from their parent factory.
 
+Modifying factories
+-------------------
+
+If you're given a set of factories (say, from a gem developer) but want to change them to fit into your application better, you can
+modify that factory instead of creating a child factory and adding attributes there.
+
+If a gem were to give you a User factory:
+
+    FactoryGirl.define do
+      factory :user do
+        full_name "John Doe"
+        sequence(:username) {|n| "user#{n}" }
+        password "password"
+      end
+    end
+
+Instead of creating a child factory that added additional attributes:
+
+    FactoryGirl.define do
+      factory :application_user, :parent => :user do
+        full_name     { Faker::Name.name }
+        date_of_birth { 21.years.ago }
+        gender        "Female"
+        health        90
+      end
+    end
+
+You could modify that factory instead.
+
+    FactoryGirl.modify do
+      factory :user do
+        full_name     { Faker::Name.name }
+        date_of_birth { 21.years.ago }
+        gender        "Female"
+        health        90
+      end
+    end
+
+When modifying a factory, you can change any of the attributes you want (aside from callbacks).
+
+`FactoryGirl.modify` must be called outside of a `FactoryGirl.define` block as it operates on factories differently.
+
+A couple caveats: you can only modify factories (not sequences or traits) and callbacks *still compound as they normally would*. So, if
+the factory you're modifying defines an `after_create` callback, you defining an `after_create` won't override it, it'll just get run after the first callback.
+You also can't modify attributes assigned by traits. So, if you have a trait that grants a name attribute, and you modify the factory to set the name,
+it currently will reflect the name in the trait instead of the modified name.
+
 Building or Creating Multiple Records
 -------------------------------------
 

data/Gemfile

@@ -1,14 +1,5 @@
 source "http://rubygems.org"
-gem "cucumber", "~> 1.0.0"
-gem "rake"
-gem "rspec", "~> 2.0"
-gem "rcov"
+
 gem "activerecord", :require => false
-gem "activesupport", :require => false
-gem "mocha"
-gem "bourne"
-gem "sqlite3-ruby", :require => false
-gem "appraisal", "~> 0.3.5"
-gem "yard"
-gem "bluecloth"
 
+gemspec

data/Gemfile.lock

@@ -1,48 +1,61 @@
+PATH
+  remote: .
+  specs:
+    factory_girl (2.1.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.1)
-    appraisal (0.3.5)
-      aruba (~> 0.3.6)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    appraisal (0.3.8)
       bundler
       rake
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    aruba (0.3.7)
-      childprocess (>= 0.1.9)
-      cucumber (>= 0.10.5)
+    arel (2.2.1)
+    aruba (0.4.6)
+      bcat (>= 0.6.1)
+      childprocess (>= 0.2.0)
+      cucumber (>= 1.0.2)
+      rdiscount (>= 1.6.8)
       rspec (>= 2.6.0)
-    bluecloth (2.0.9)
+    bcat (0.6.1)
+      rack (~> 1.0)
+    bcrypt-ruby (3.0.0)
+    bluecloth (2.1.0)
     bourne (1.0)
       mocha (= 0.9.8)
-    builder (2.1.2)
-    childprocess (0.1.9)
+    builder (3.0.0)
+    childprocess (0.2.2)
       ffi (~> 1.0.6)
-    cucumber (1.0.0)
+    cucumber (1.0.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.1)
+      gherkin (~> 2.4.5)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     ffi (1.0.9)
-    gherkin (2.4.1)
+    gherkin (2.4.16)
       json (>= 1.4.6)
-    i18n (0.4.2)
-    json (1.5.3)
+    i18n (0.6.0)
+    json (1.5.4)
     mocha (0.9.8)
       rake
+    multi_json (1.0.3)
+    rack (1.3.2)
     rake (0.9.2)
-    rcov (0.9.9)
+    rcov (0.9.10)
+    rdiscount (1.6.8)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -51,24 +64,28 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    sqlite3-ruby (1.3.2)
-    term-ansicolor (1.0.5)
-    tzinfo (0.3.23)
-    yard (0.6.4)
+    sqlite3 (1.3.4)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    term-ansicolor (1.0.6)
+    timecop (0.3.5)
+    tzinfo (0.3.29)
+    yard (0.7.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord
-  activesupport
-  appraisal (~> 0.3.5)
+  appraisal (~> 0.3.8)
+  aruba
   bluecloth
   bourne
   cucumber (~> 1.0.0)
+  factory_girl!
   mocha
-  rake
   rcov
   rspec (~> 2.0)
   sqlite3-ruby
+  timecop
   yard

data/README.md

@@ -1,4 +1,4 @@
-# factory_girl [![Build Status](https://secure.travis-ci.org/thoughtbot/factory_girl.png)](http://travis-ci.org/thoughtbot/factory_girl)
+# factory_girl [![Build Status](https://secure.travis-ci.org/thoughtbot/factory_girl.png)](http://travis-ci.org/thoughtbot/factory_girl?branch=master)
 
 factory_girl is a fixtures replacement with a straightforward definition syntax, support for multiple build strategies (saved instances, unsaved instances, attribute hashes, and stubbed objects), and support for multiple factories for the same class (user, admin_user, and so on), including factory inheritance.
 
@@ -49,6 +49,8 @@ factory_girl was written by Joe Ferris with contributions from several authors,
 * Josh Nichols
 * Josh Owens
 * Nate Sutton
+* Josh Clayton
+* Thomas Walpole
 
 The syntax layers are derived from software written by the following authors:
 

data/cucumber.yml

@@ -0,0 +1 @@
+default: -r features features

data/features/find_definitions.feature

@@ -44,19 +44,32 @@ Feature: Factory girl can find factory definitions correctly
       | name     |
       | great!!! |
 
-  Scenario: Find definitions after clearing loaded factories
-    Given a file named "nested/swell_factories.rb" with:
+  Scenario: Reload Factory Girl
+    Given a file named "nested/reload_factories.rb" with:
     """
     FactoryGirl.define do
-      factory :swell_category, :class => Category do
-        name "swell!!!"
+      sequence(:great)
+      trait :admin do
+        admin true
+      end
+
+      factory :handy_category, :class => Category do
+        name "handy"
       end
     end
     """
     When "nested" is added to Factory Girl's file definitions path
-    And I clear out the factories
-    And I find definitions
-    And I create a "swell_category" instance from Factory Girl
+    And I append to "nested/reload_factories.rb" with:
+    """
+
+    FactoryGirl.modify do
+      factory :handy_category do
+        name "HANDY!!!"
+      end
+    end
+    """
+    And I reload factories
+    And I create a "handy_category" instance from Factory Girl
     Then I should find the following for the last category:
       | name     |
-      | swell!!! |
+      | HANDY!!! |

data/features/step_definitions/factory_girl_steps.rb

@@ -34,10 +34,10 @@ Given /^these super users exist:$/ do |table|
   Given %{the following person exists:}, new_table
 end
 
-When /^I clear out the factories$/ do
-  FactoryGirl.factories.clear
-end
-
 When /^I find definitions$/ do
   FactoryGirl.find_definitions
 end
+
+When /^I reload factories$/ do
+  FactoryGirl.reload
+end

data/gemfiles/2.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activerecord", "~> 2.1"
+gem "test-unit", "~> 2.3.0", :platforms=>[:mri_19]
+
+gemspec :path=>"../"

data/gemfiles/2.1.gemfile.lock

@@ -0,0 +1,73 @@
+PATH
+  remote: /Users/joshuaclayton/dev/gems/factory_girl
+  specs:
+    factory_girl (2.1.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord (2.3.12)
+      activesupport (= 2.3.12)
+    activesupport (2.3.12)
+    appraisal (0.3.8)
+      bundler
+      rake
+    aruba (0.3.7)
+      childprocess (>= 0.1.9)
+      cucumber (>= 0.10.5)
+      rspec (>= 2.6.0)
+    bluecloth (2.1.0)
+    bourne (1.0)
+      mocha (= 0.9.8)
+    builder (3.0.0)
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
+    cucumber (1.0.0)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.1)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    diff-lcs (1.1.2)
+    ffi (1.0.9)
+    gherkin (2.4.1)
+      json (>= 1.4.6)
+    json (1.5.3)
+    mocha (0.9.8)
+      rake
+    rake (0.9.2)
+    rcov (0.9.9)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    term-ansicolor (1.0.5)
+    test-unit (2.3.0)
+    timecop (0.3.5)
+    yard (0.7.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 2.1)
+  appraisal (~> 0.3.8)
+  aruba
+  bluecloth
+  bourne
+  cucumber (~> 1.0.0)
+  factory_girl!
+  mocha
+  rcov
+  rspec (~> 2.0)
+  sqlite3-ruby
+  test-unit (~> 2.3.0)
+  timecop
+  yard