factory_girl 4.8.1 → 4.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ceeca3f3f93cc3394beba00cb146418a0da7161b
-  data.tar.gz: 475b27d583aaac3a83d769bb3be01d07a0a41b29
+  metadata.gz: e16a4a30eb303ecf77779a64966bb5542f4f1a19
+  data.tar.gz: a4a44676d4602a413fe5447d6a78ac62f8fd9a77
 SHA512:
-  metadata.gz: 41d5105c3878506f0c0e27257d8ab250863db5abe33834e2c3fe1bcfdf962d61a000a3d06e382c506427b7b0d76ea6fc193a026321431694ee72db484047deff
-  data.tar.gz: e7d20de687a85d18d924caf583006cd4abe39efc93eb15bb96edb8f331bd0f66d0d23d0289e99cf257fac8db518e8ab853d83bd822c8cb57f8455f09fcc9eb55
+  metadata.gz: 95d58dc9a5f1aa320431927c7a84af285c96d0cb7cd8a3ae0ee124658d7bff391f304e5977ac12c2f87f93b3bf0f0c816912c4b714c2dbc305657e5ecab64b90
+  data.tar.gz: 33928a2fc80baa62226a3a83fa19f144debe62b56cb047c88d511b2267ecd74f844f08d2083b9e2160f4d90fc7163be67fd167c98ffadc80101f0b1b63174bc6

data/GETTING_STARTED.md

@@ -986,14 +986,12 @@ namespace :factory_girl do
   desc "Verify that all FactoryGirl factories are valid"
   task lint: :environment do
     if Rails.env.test?
-      begin
-        DatabaseCleaner.start
+      DatabaseCleaner.cleaning do
         FactoryGirl.lint
-      ensure
-        DatabaseCleaner.clean
       end
     else
       system("bundle exec rake factory_girl:lint RAILS_ENV='test'")
+      exit $?.exitstatus
     end
   end
 end
@@ -1030,6 +1028,12 @@ This can also be combined with other arguments:
 FactoryGirl.lint factories_to_lint, traits: true
 ```
 
+You can also specify the strategy used for linting:
+
+```ruby
+FactoryGirl.lint strategy: :build
+```
+
 Custom Construction
 -------------------
 

data/Gemfile.lock

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

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2016 Joe Ferris and thoughtbot, inc.
+Copyright (c) 2008-2017 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,6 @@
+4.9.0 (October 23, 2017)
+  Deprecate factory_girl in favor of factory_bot
+
 4.8.1 (September 28, 2017)
   Explicitly define `#destroyed?` within the `Stub` strategy to return `nil` instead of raising
   Update various dependencies

data/README.md

@@ -78,7 +78,7 @@ community](https://github.com/thoughtbot/factory_girl/graphs/contributors).
 License
 -------
 
-factory_girl is Copyright © 2008-2016 Joe Ferris and thoughtbot. It is free
+factory_girl is Copyright © 2008-2017 Joe Ferris and thoughtbot. It is free
 software, and may be redistributed under the terms specified in the
 [LICENSE](/LICENSE) file.
 

data/UPGRADE_FROM_FACTORY_GIRL.md

@@ -0,0 +1,48 @@
+# Upgrade from factory\_girl
+
+Upgrading your codebase should involve only a few steps, and in most cases, it
+involves updating the Gemfile, factories file(s), and support file configuring
+the testing framework.
+
+## Modify your Gemfile
+
+Replace references to factory\_girl\_rails or factory\_girl with
+factory\_bot\_rails or factory\_bot. Both new gems are available starting at
+version 4.8.2.
+
+```ruby
+# Gemfile
+
+# old
+group :development, :test do
+  gem "factory_girl_rails"
+  # or
+  gem "factory_girl"
+end
+
+# new
+group :development, :test do
+  gem "factory_bot_rails"
+  # or
+  gem "factory_bot"
+end
+```
+
+## Replace All Constant References
+
+A global find-and-replace of `FactoryGirl` to `FactoryBot` across the codebase
+to replace all references with the new constant should do the trick. For
+example, on OS X:
+
+```sh
+grep -e FactoryGirl **/*.rake **/*.rb -l | xargs sed -i "" "s|FactoryGirl|FactoryBot|"
+```
+
+## Replace All Path References
+
+If you're requiring files from factory\_girl or factory\_girl\_rails directly,
+you'll have to update the paths.
+
+```sh
+grep -e factory_girl **/*.rake **/*.rb -l | xargs sed -i "" "s|factory_girl|factory_bot|"
+```

data/gemfiles/3.2.gemfile.lock

@@ -18,7 +18,7 @@ GIT
 PATH
   remote: ../
   specs:
-    factory_girl (4.8.1)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/4.0.gemfile.lock

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

data/gemfiles/4.1.gemfile.lock

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

data/gemfiles/4.2.gemfile.lock

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

data/gemfiles/5.0.gemfile.lock

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

data/lib/factory_girl.rb

@@ -59,12 +59,14 @@ module FactoryGirl
   # Parameters:
   # factories - which factories to lint; omit for all factories
   # options:
-  #   traits : true - to lint traits as well as factories
+  #   traits: true - to lint traits as well as factories
+  #   strategy: :create - to specify the strategy for linting
   def self.lint(*args)
     options = args.extract_options!
     factories_to_lint = args[0] || FactoryGirl.factories
-    strategy = options[:traits] ? :factory_and_traits : :factory
-    Linter.new(factories_to_lint, strategy).lint!
+    linting_strategy = options[:traits] ? :factory_and_traits : :factory
+    factory_strategy = options[:strategy] || :create
+    Linter.new(factories_to_lint, linting_strategy, factory_strategy).lint!
   end
 
   class << self
@@ -152,3 +154,5 @@ end
 
 FactoryGirl.register_default_strategies
 FactoryGirl.register_default_callbacks
+
+ActiveSupport::Deprecation.warn "The factory_girl gem is deprecated. Please upgrade to factory_bot. See https://github.com/thoughtbot/factory_bot/blob/v4.9.0/UPGRADE_FROM_FACTORY_GIRL.md for further instructions."

data/lib/factory_girl/evaluation.rb

@@ -4,7 +4,8 @@ module FactoryGirl
   class Evaluation
     include Observable
 
-    def initialize(attribute_assigner, to_create)
+    def initialize(evaluator, attribute_assigner, to_create)
+      @evaluator = evaluator
       @attribute_assigner = attribute_assigner
       @to_create = to_create
     end
@@ -12,7 +13,10 @@ module FactoryGirl
     delegate :object, :hash, to: :@attribute_assigner
 
     def create(result_instance)
-      @to_create[result_instance]
+      case @to_create.arity
+      when 2 then @to_create[result_instance, @evaluator]
+      else @to_create[result_instance]
+      end
     end
 
     def notify(name, result_instance)

data/lib/factory_girl/factory.rb

@@ -36,7 +36,8 @@ module FactoryGirl
       evaluator = evaluator_class.new(strategy, overrides.symbolize_keys)
       attribute_assigner = AttributeAssigner.new(evaluator, build_class, &compiled_constructor)
 
-      evaluation = Evaluation.new(attribute_assigner, compiled_to_create)
+      evaluation =
+        Evaluation.new(evaluator, attribute_assigner, compiled_to_create)
       evaluation.add_observer(CallbacksObserver.new(callbacks, evaluator))
 
       strategy.result(evaluation).tap(&block)

data/lib/factory_girl/linter.rb

@@ -1,9 +1,10 @@
 module FactoryGirl
   class Linter
 
-    def initialize(factories_to_lint, linting_strategy)
-      @factories_to_lint = factories_to_lint
+    def initialize(factories, linting_strategy, factory_strategy = :create)
+      @factories_to_lint = factories
       @linting_method = "lint_#{linting_strategy}"
+      @factory_strategy = factory_strategy
       @invalid_factories = calculate_invalid_factories
     end
 
@@ -13,11 +14,10 @@ module FactoryGirl
       end
     end
 
-    attr_reader :factories_to_lint, :invalid_factories
-    private :factories_to_lint, :invalid_factories
-
     private
 
+    attr_reader :factories_to_lint, :invalid_factories, :factory_strategy
+
     def calculate_invalid_factories
       factories_to_lint.reduce(Hash.new([])) do |result, factory|
         errors = send(@linting_method, factory)
@@ -56,7 +56,7 @@ module FactoryGirl
     def lint_factory(factory)
       result = []
       begin
-        FactoryGirl.create(factory.name)
+        FactoryGirl.public_send(factory_strategy, factory.name)
       rescue => error
         result |= [FactoryError.new(error, factory)]
       end
@@ -67,7 +67,7 @@ module FactoryGirl
       result = []
       factory.definition.defined_traits.map(&:name).each do |trait_name|
         begin
-          FactoryGirl.create(factory.name, trait_name)
+          FactoryGirl.public_send(factory_strategy, factory.name, trait_name)
         rescue => error
           result |=
               [FactoryTraitError.new(error, factory, trait_name)]

data/lib/factory_girl/version.rb

@@ -1,3 +1,3 @@
 module FactoryGirl
-  VERSION = '4.8.1'.freeze
+  VERSION = '4.9.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl
 version: !ruby/object:Gem::Version
-  version: 4.8.1
+  version: 4.9.0
 platform: ruby
 authors:
 - Josh Clayton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -178,6 +178,7 @@ files:
 - NEWS
 - README.md
 - Rakefile
+- UPGRADE_FROM_FACTORY_GIRL.md
 - cucumber.yml
 - factory_girl.gemspec
 - gemfiles/3.2.gemfile