factory_girl 4.3.0 → 4.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    factory_girl (4.3.0)
+    factory_girl (4.4.0)
       activesupport (>= 3.0.0)
 
 GEM

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2013 Joe Ferris and thoughtbot, inc.
+Copyright (c) 2008-2014 Joe Ferris and thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS

@@ -1,3 +1,17 @@
+4.4.0 (February 10, 2014)
+  Add FactoryGirl.lint
+  Fix memory leak in duplicate traits
+  Update documentation
+
+4.3.0 (November 3, 2013)
+  Start testing against Rails 4.0 and Ruby 2.0.0
+  Stop testing against Rails 3.0 and Ruby 1.9.2
+  Add *_pair methods to only build two objects
+  Raise if a method is defined with a FactoryGirl block (factory or trait)
+  Allow use of Symbol#to_proc in callbacks
+  Add global callbacks
+  Improve GETTING_STARTED and README
+
 4.2.0 (January 18, 2013)
   Improve documentation
   Allow *_list syntax methods to accept a block

data/README.md

@@ -28,18 +28,18 @@ and run `bundle install` from your shell.
 Supported Ruby versions
 -----------------------
 
-The FactoryGirl 3.x+ series supports MRI Ruby 1.9. Additionally, FactoryGirl
+The factory_girl 3.x+ series supports MRI Ruby 1.9. Additionally, factory_girl
 3.6+ supports JRuby 1.6.7.2+ while running in 1.9 mode. See
 [GETTING_STARTED](https://github.com/thoughtbot/factory_girl/blob/master/GETTING_STARTED.md)
 for more information on configuring the JRuby environment.
 
-For versions of Ruby prior to 1.9, please use FactoryGirl 2.x.
+For versions of Ruby prior to 1.9, please use factory_girl 2.x.
 
 More Information
 ----------------
 
 * [Rubygems](https://rubygems.org/gems/factory_girl)
-* [Mailing list](http://groups.google.com/group/factory_girl)
+* [Stack Overflow](http://stackoverflow.com/questions/tagged/factory-girl)
 * [Issues](https://github.com/thoughtbot/factory_girl/issues)
 * [GIANT ROBOTS SMASHING INTO OTHER GIANT ROBOTS](http://robots.thoughtbot.com/)
 
@@ -64,4 +64,4 @@ The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 License
 -------
 
-factory_girl is Copyright © 2008-2013 Joe Ferris and thoughtbot. It is free software, and may be redistributed under the terms specified in the [LICENSE](https://github.com/thoughtbot/factory_girl/blob/master/LICENSE) file.
+factory_girl is Copyright © 2008-2014 Joe Ferris and thoughtbot. It is free software, and may be redistributed under the terms specified in the [LICENSE](https://github.com/thoughtbot/factory_girl/blob/master/LICENSE) file.

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    factory_girl (4.3.0)
+    factory_girl (4.4.0)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (4.3.0)
+    factory_girl (4.4.0)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    factory_girl (4.3.0)
+    factory_girl (4.4.0)
       activesupport (>= 3.0.0)
 
 GEM

data/lib/factory_girl.rb

@@ -54,6 +54,26 @@ module FactoryGirl
     @configuration = nil
   end
 
+  def self.lint
+    invalid_factories = FactoryGirl.factories.select do |factory|
+      built_factory = FactoryGirl.build(factory.name)
+
+      if built_factory.respond_to?(:valid?)
+        !built_factory.valid?
+      end
+    end
+
+    if invalid_factories.any?
+      error_message = <<-ERROR_MESSAGE.strip
+The following factories are invalid:
+
+#{invalid_factories.map {|factory| "* #{factory.name}" }.join("\n")}
+      ERROR_MESSAGE
+
+      raise InvalidFactoryError, error_message
+    end
+  end
+
   class << self
     delegate :factories, :sequences, :traits, :callbacks, :strategies, :callback_names,
       :to_create, :skip_create, :initialize_with, :constructor, :duplicate_attribute_assignment_from_initialize_with,

data/lib/factory_girl/attribute_assigner.rb

@@ -90,7 +90,7 @@ module FactoryGirl
 
     def alias_names_to_ignore
       @attribute_list.non_ignored.map do |attribute|
-        override_names.map {|override| attribute.name if attribute.alias_for?(override) && attribute.name != override && !ignored_attribute_names.include?(override) }
+        override_names.map { |override| attribute.name if attribute.alias_for?(override) && attribute.name != override && !ignored_attribute_names.include?(override) }
       end.flatten.compact
     end
   end

data/lib/factory_girl/attribute_list.rb

@@ -36,7 +36,7 @@ module FactoryGirl
     end
 
     def apply_attributes(attributes_to_apply)
-      attributes_to_apply.each {|attribute| add_attribute(attribute) }
+      attributes_to_apply.each { |attribute| add_attribute(attribute) }
     end
 
     private

data/lib/factory_girl/callbacks_observer.rb

@@ -15,7 +15,7 @@ module FactoryGirl
     private
 
     def callbacks_by_name(name)
-      @callbacks.select {|callback| callback.name == name }
+      @callbacks.select { |callback| callback.name == name }
     end
   end
 end

data/lib/factory_girl/configuration.rb

@@ -11,7 +11,7 @@ module FactoryGirl
       @callback_names = Set.new
       @definition     = Definition.new
 
-      to_create {|instance| instance.save! }
+      to_create { |instance| instance.save! }
       initialize_with { new }
     end
 

data/lib/factory_girl/declaration_list.rb

@@ -35,11 +35,11 @@ module FactoryGirl
     private
 
     def delete_declaration(declaration)
-      @declarations.delete_if {|decl| decl.name == declaration.name }
+      @declarations.delete_if { |decl| decl.name == declaration.name }
     end
 
     def to_attributes
-      @declarations.inject([]) {|result, declaration| result += declaration.to_attributes }
+      @declarations.inject([]) { |result, declaration| result += declaration.to_attributes }
     end
 
     def overridable?

data/lib/factory_girl/definition.rb

@@ -6,7 +6,7 @@ module FactoryGirl
     def initialize(name = nil, base_traits = [])
       @declarations      = DeclarationList.new(name)
       @callbacks         = []
-      @defined_traits    = []
+      @defined_traits    = Set.new
       @to_create         = nil
       @base_traits       = base_traits
       @additional_traits = []
@@ -47,8 +47,8 @@ module FactoryGirl
         declarations.attributes
 
         defined_traits.each do |defined_trait|
-          base_traits.each       {|bt| bt.define_trait defined_trait }
-          additional_traits.each {|bt| bt.define_trait defined_trait }
+          base_traits.each       { |bt| bt.define_trait defined_trait }
+          additional_traits.each { |bt| bt.define_trait defined_trait }
         end
 
         @compiled = true
@@ -77,7 +77,7 @@ module FactoryGirl
     end
 
     def define_trait(trait)
-      @defined_traits << trait
+      @defined_traits.add(trait)
     end
 
     def define_constructor(&block)
@@ -85,11 +85,11 @@ module FactoryGirl
     end
 
     def before(*names, &block)
-      callback(*names.map {|name| "before_#{name}" }, &block)
+      callback(*names.map { |name| "before_#{name}" }, &block)
     end
 
     def after(*names, &block)
-      callback(*names.map {|name| "after_#{name}" }, &block)
+      callback(*names.map { |name| "after_#{name}" }, &block)
     end
 
     def callback(*names, &block)
@@ -114,7 +114,7 @@ module FactoryGirl
     end
 
     def trait_for(name)
-      defined_traits.detect {|trait| trait.name == name }
+      defined_traits.detect { |trait| trait.name == name }
     end
 
     def initialize_copy(source)

data/lib/factory_girl/errors.rb

@@ -19,4 +19,7 @@ module FactoryGirl
 
   # Raised when a method is defined in a factory or trait with arguments
   class MethodDefinitionError < RuntimeError; end
+
+  # Raised when any factory is considered invalid
+  class InvalidFactoryError < RuntimeError; end
 end

data/lib/factory_girl/factory.rb

@@ -43,7 +43,7 @@ module FactoryGirl
     end
 
     def human_names
-      names.map {|name| name.to_s.humanize.downcase }
+      names.map { |name| name.to_s.humanize.downcase }
     end
 
     def associations
@@ -82,7 +82,7 @@ module FactoryGirl
     def compile
       unless @compiled
         parent.compile
-        parent.defined_traits.each {|trait| define_trait(trait) }
+        parent.defined_traits.each { |trait| define_trait(trait) }
         @definition.compile
         build_hierarchy
         @compiled = true

data/lib/factory_girl/find_definitions.rb

@@ -10,7 +10,7 @@ module FactoryGirl
   self.definition_file_paths = %w(factories test/factories spec/factories)
 
   def self.find_definitions
-    absolute_definition_file_paths = definition_file_paths.map {|path| File.expand_path(path) }
+    absolute_definition_file_paths = definition_file_paths.map { |path| File.expand_path(path) }
 
     absolute_definition_file_paths.uniq.each do |path|
       load("#{path}.rb") if File.exists?("#{path}.rb")

data/lib/factory_girl/version.rb

@@ -1,3 +1,3 @@
 module FactoryGirl
-  VERSION = '4.3.0'
+  VERSION = '4.4.0'
 end

data/spec/acceptance/callbacks_spec.rb

@@ -82,8 +82,8 @@ describe "callbacks using syntax methods without referencing FactoryGirl explici
 
       factory :user do
         after(:stub)   { generate(:sequence_3) }
-        after(:build)  {|user| user.first_name = generate(:sequence_1) }
-        after(:create) {|user, evaluator| user.last_name = generate(:sequence_2) }
+        after(:build)  { |user| user.first_name = generate(:sequence_1) }
+        after(:create) { |user, evaluator| user.last_name = generate(:sequence_2) }
       end
     end
   end
@@ -149,8 +149,8 @@ describe "custom callbacks" do
         first_name "John"
         last_name  "Doe"
 
-        before(:custom) {|instance| instance.first_name = "Overridden First" }
-        after(:custom)  {|instance| instance.last_name  = "Overridden Last" }
+        before(:custom) { |instance| instance.first_name = "Overridden First" }
+        after(:custom)  { |instance| instance.last_name  = "Overridden Last" }
         callback(:totally_custom) do |instance|
           instance.first_name = "Totally"
           instance.last_name  = "Custom"

data/spec/acceptance/global_to_create_spec.rb

@@ -6,10 +6,10 @@ describe 'global to_create' do
     define_model('Post', name: :string)
 
     FactoryGirl.define do
-      to_create {|instance| instance.name = 'persisted!' }
+      to_create { |instance| instance.name = 'persisted!' }
 
       trait :override_to_create do
-        to_create {|instance| instance.name = 'override' }
+        to_create { |instance| instance.name = 'override' }
       end
 
       factory :user do
@@ -75,7 +75,7 @@ describe 'global skip_create' do
       skip_create
 
       trait :override_to_create do
-        to_create {|instance| instance.name = 'override' }
+        to_create { |instance| instance.name = 'override' }
       end
 
       factory :user do

data/spec/acceptance/initialize_with_spec.rb

@@ -160,7 +160,7 @@ describe "initialize_with doesn't duplicate assignment on attributes accessed fr
     end
 
     FactoryGirl.define do
-      sequence(:email) {|n| "person#{n}@example.com" }
+      sequence(:email) { |n| "person#{n}@example.com" }
 
       factory :user do
         email
@@ -192,7 +192,7 @@ describe "initialize_with has access to all attributes for construction" do
     end
 
     FactoryGirl.define do
-      sequence(:email) {|n| "person#{n}@example.com" }
+      sequence(:email) { |n| "person#{n}@example.com" }
 
       factory :user do
         ignore do

data/spec/acceptance/keyed_by_class_spec.rb

@@ -9,7 +9,7 @@ describe 'finding factories keyed by class instead of symbol' do
     FactoryGirl.define do
       factory :user do
         name 'John Doe'
-        sequence(:email) {|n| "person#{n}@example.com" }
+        sequence(:email) { |n| "person#{n}@example.com" }
       end
     end
   end

data/spec/acceptance/lint_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe 'FactoryGirl.lint' do
+  it 'raises when a factory is invalid' do
+    define_model 'User', name: :string do
+      validates :name, presence: true
+    end
+
+    define_model 'AlwaysValid'
+
+    FactoryGirl.define do
+      factory :user do
+        factory :admin_user
+      end
+
+      factory :always_valid
+    end
+
+    error_message = <<-ERROR_MESSAGE.strip
+The following factories are invalid:
+
+* user
+* admin_user
+    ERROR_MESSAGE
+
+    expect do
+      FactoryGirl.lint
+    end.to raise_error FactoryGirl::InvalidFactoryError, error_message
+  end
+
+  it 'does not raise when all factories are valid' do
+    define_model 'User', name: :string do
+      validates :name, presence: true
+    end
+
+    FactoryGirl.define do
+      factory :user do
+        name 'assigned'
+      end
+    end
+
+    expect { FactoryGirl.lint }.not_to raise_error
+  end
+
+  it 'supports models which do not respond to #valid?' do
+    define_class 'Thing'
+
+    FactoryGirl.define do
+      factory :thing
+    end
+
+    expect(Thing.new).not_to respond_to(:valid?)
+    expect { FactoryGirl.lint }.not_to raise_error
+  end
+end

data/spec/acceptance/modify_factories_spec.rb

@@ -7,7 +7,7 @@ describe "modifying factories" do
     define_model('User', name: :string, admin: :boolean, email: :string, login: :string)
 
     FactoryGirl.define do
-      sequence(:email) {|n| "user#{n}@example.com" }
+      sequence(:email) { |n| "user#{n}@example.com" }
 
       factory :user do
         email

data/spec/acceptance/nested_attributes_spec.rb

@@ -17,7 +17,7 @@ describe "association assignment from nested attributes" do
       end
 
       factory :comment do
-        sequence(:body) {|n| "Body #{n}" }
+        sequence(:body) { |n| "Body #{n}" }
       end
     end
   end

data/spec/acceptance/parent_spec.rb

@@ -78,7 +78,7 @@ describe "nested factories with different parents" do
         end
 
         factory :uppercase_male_user, parent: :male_user do
-          after(:build) {|user| user.name = user.name.upcase }
+          after(:build) { |user| user.name = user.name.upcase }
         end
       end
     end

data/spec/acceptance/sequence_context_spec.rb

@@ -14,7 +14,7 @@ describe 'sequences are evaluated in the correct context' do
   it 'builds a sequence calling sprintf correctly' do
     FactoryGirl.define do
       factory :sequence_with_sprintf, class: User do
-        sequence(:id) {|n| sprintf("foo%d", n) }
+        sequence(:id) { |n| sprintf("foo%d", n) }
       end
     end
 
@@ -24,7 +24,7 @@ describe 'sequences are evaluated in the correct context' do
   it 'invokes the correct method on the instance' do
     FactoryGirl.define do
       factory :sequence_with_public_method, class: User do
-        sequence(:id) {|n| public_method(:awesome).call }
+        sequence(:id) { |n| public_method(:awesome).call }
       end
     end
 
@@ -34,7 +34,7 @@ describe 'sequences are evaluated in the correct context' do
   it 'invokes a method with no arguments on the instance' do
     FactoryGirl.define do
       factory :sequence_with_frozen, class: User do
-        sequence(:id) {|n| frozen? }
+        sequence(:id) { |n| frozen? }
       end
     end
 
@@ -44,7 +44,7 @@ describe 'sequences are evaluated in the correct context' do
   it 'allows direct reference of a method in a sequence' do
     FactoryGirl.define do
       factory :sequence_referencing_attribute_directly, class: User do
-        sequence(:id) {|n| "#{awesome}#{n}" }
+        sequence(:id) { |n| "#{awesome}#{n}" }
       end
     end
     expect(FactoryGirl.build(:sequence_referencing_attribute_directly).id).to eq 'aw yeah1'