factory_bot 6.5.0 → 6.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44611a193b219b270cd43b7a8587718ff190b3c63162c17f02288afc362a37e9
-  data.tar.gz: a1a3d3ce45776e1d8d228f113af1c101a64090fde8f19a46321d40bec3df0e48
+  metadata.gz: 9e569214d220256c1f88d64718013ed8ac59c318233e144623ea660dfd28bcca
+  data.tar.gz: a8156b55e0e3f82f63f851bd979310a20ec5078f0beda6167b4e733a11f8bd85
 SHA512:
-  metadata.gz: 2e65a906e197e8e9f268440ba3ffbc0a717b211420419f0ce0f9ff0a5b5e90413d4a76b829f45fe4746541aae91869afdee8975b3171841c4655d6627979aa2b
-  data.tar.gz: 400e0cb1dab0994f26a46674a5d7f0cb6dc89a95815faab5da8838f732c9e6ac92fac6af17270ce4aaba3f84cdcbfcf96361021a7671a37e33a9d27e77cb652b
+  metadata.gz: ebf041f57ee689eac93ec49a9ee1b3cf8ed9173f3f96893ff6475bd6e1c604a35c87b2a89da9ad7d883b4e8011292f75c122514b6290064521b587cc1e133fef
+  data.tar.gz: 80045a8952d9475cf73f4291090cb9cbba04e0d3471bc453c50acc3deb8a4ea4824fcecf3e4d0759186c903fdd26643591fc7c0eaa147940bbd47231b63a475b

data/GETTING_STARTED.md

@@ -255,10 +255,12 @@ Factories can be defined anywhere, but will be automatically loaded after
 calling `FactoryBot.find_definitions` if factories are defined in files at the
 following locations:
 
+    factories.rb
+    factories/**/*.rb
     test/factories.rb
+    test/factories/**/*.rb
     spec/factories.rb
-    test/factories/*.rb
-    spec/factories/*.rb
+    spec/factories/**/*.rb
 
 ### Static Attributes
 

data/NEWS.md

@@ -1,5 +1,23 @@
 # News
 
+## 6.5.2 (May 30, 2025)
+
+    * Changed: Updated "verbose linting" test to allow for backtrace changes in Ruby 3.4 (CodeMeister)
+    * Fix: Set the same timestamps for `created_at` and `updated_at` on `build_stubbed` (Kim Emmanuel)
+    * Fix: Refactored sequences to ensure cloned traits use parent sequences. (CodeMeister)
+    * Docs: Fix definition_file_paths comment (Milo Winningham)
+    * Docs: Add ruby-lsp extensions to Useful Tools in README.md (johansenja)
+    * Docs: Fix docs about definition file paths (Ryo Nakamura)
+    * Docs: Update has_many-associations.md to mention that traits can use inline associations (Matthew Zagaja)
+    * Docs: Fix "Transitioning from Factory Girl" guide link (Neil Carvalho)
+
+## 6.5.1 (January 31, 2025)
+
+  * Changed: execute linting tests within ActiveRecord transactions when available (Sean Doyle)
+  * Fix: Random test failure when tracking compilation time (CodeMeister)
+  * Fix: Bump the minimum required activesupport version to 6.1 (Earlopain)
+  * Internal: Update development dependencies (Neil Carvalho)
+
 ## 6.5.0 (September 6, 2024)
 
   * fix: issue 1621 broken links in ref/factory.md by @elasticspoon in https://github.com/thoughtbot/factory_bot/pull/1623

data/README.md

@@ -10,7 +10,7 @@ _[Interested in the history of the project name?][NAME]_
 
 ### Transitioning from factory\_girl?
 
-Check out the [guide](https://github.com/thoughtbot/factory_bot/blob/4-9-0-stable/UPGRADE_FROM_FACTORY_GIRL.md).
+Check out the [guide](https://github.com/thoughtbot/factory_bot/blob/v4.9.0/UPGRADE_FROM_FACTORY_GIRL.md).
 
 
 Documentation
@@ -62,6 +62,7 @@ Useful Tools
 ------------
 
 * [FactoryTrace](https://github.com/djezzzl/factory_trace) - helps to find unused factories and traits.
+* [ruby-lsp-factory_bot](https://github.com/donny741/ruby-lsp-factory_bot) / [ruby-lsp-rails-factory-bot](https://github.com/johansenja/ruby-lsp-rails-factory-bot) - integration with [ruby-lsp](https://github.com/Shopify/ruby-lsp) to provide intellisense
 
 Contributing
 ------------
@@ -96,7 +97,6 @@ We are [available for hire][hire].
 [community]: https://thoughtbot.com/community?utm_source=github
 [hire]: https://thoughtbot.com/hire-us?utm_source=github
 
-
 <!-- END /templates/footer.md -->
 
 [ci-image]: https://github.com/thoughtbot/factory_bot/actions/workflows/build.yml/badge.svg?branch=main

data/lib/factory_bot/definition.rb

@@ -95,6 +95,10 @@ module FactoryBot
       @defined_traits.add(trait)
     end
 
+    def defined_traits_names
+      @defined_traits.map(&:name)
+    end
+
     def register_enum(enum)
       @registered_enums << enum
     end

data/lib/factory_bot/definition_proxy.rb

@@ -120,9 +120,9 @@ module FactoryBot
     #
     # Except that no globally available sequence will be defined.
     def sequence(name, ...)
-      sequence = Sequence.new(name, ...)
-      FactoryBot::Internal.register_inline_sequence(sequence)
-      add_attribute(name) { increment_sequence(sequence) }
+      new_sequence = Sequence.new(name, ...)
+      registered_sequence = __fetch_or_register_sequence(new_sequence)
+      add_attribute(name) { increment_sequence(registered_sequence) }
     end
 
     # Adds an attribute that builds an association. The associated instance will
@@ -252,5 +252,19 @@ module FactoryBot
     def __valid_association_options?(options)
       options.respond_to?(:has_key?) && options.has_key?(:factory)
     end
+
+    ##
+    # If the sequence has already been registered by a parent, return that one,
+    # otherwise register and return the given sequence
+    #
+    def __fetch_or_register_sequence(sequence)
+      FactoryBot::Internal.inline_sequences
+        .each do |registered_sequence|
+        return registered_sequence if registered_sequence.matches?(sequence)
+      end
+
+      FactoryBot::Internal.register_inline_sequence(sequence)
+      sequence
+    end
   end
 end

data/lib/factory_bot/factory.rb

@@ -17,7 +17,8 @@ module FactoryBot
     end
 
     delegate :add_callback, :declare_attribute, :to_create, :define_trait, :constructor,
-      :defined_traits, :inherit_traits, :append_traits, to: :@definition
+      :defined_traits, :defined_traits_names, :inherit_traits, :append_traits,
+      to: :@definition
 
     def build_class
       @build_class ||= if class_name.is_a? Class
@@ -85,7 +86,7 @@ module FactoryBot
     def compile
       unless @compiled
         parent.compile
-        parent.defined_traits.each { |trait| define_trait(trait) }
+        inherit_parent_traits
         @definition.compile(build_class)
         build_hierarchy
         @compiled = true
@@ -153,6 +154,13 @@ module FactoryBot
       end
     end
 
+    def inherit_parent_traits
+      parent.defined_traits.each do |trait|
+        next if defined_traits_names.include?(trait.name)
+        define_trait(trait.clone)
+      end
+    end
+
     def initialize_copy(source)
       super
       @definition = @definition.clone

data/lib/factory_bot/find_definitions.rb

@@ -2,8 +2,8 @@ module FactoryBot
   class << self
     # An Array of strings specifying locations that should be searched for
     # factory definitions. By default, factory_bot will attempt to require
-    # "factories", "test/factories" and "spec/factories". Only the first
-    # existing file will be loaded.
+    # "factories.rb", "factories/**/*.rb", "test/factories.rb",
+    # "test/factories/**.rb", "spec/factories.rb", and "spec/factories/**.rb".
     attr_accessor :definition_file_paths
   end
 

data/lib/factory_bot/linter.rb

@@ -70,7 +70,7 @@ module FactoryBot
     def lint_factory(factory)
       result = []
       begin
-        FactoryBot.public_send(factory_strategy, factory.name)
+        in_transaction { FactoryBot.public_send(factory_strategy, factory.name) }
       rescue => e
         result |= [FactoryError.new(e, factory)]
       end
@@ -80,7 +80,7 @@ module FactoryBot
     def lint_traits(factory)
       result = []
       factory.definition.defined_traits.map(&:name).each do |trait_name|
-        FactoryBot.public_send(factory_strategy, factory.name, trait_name)
+        in_transaction { FactoryBot.public_send(factory_strategy, factory.name, trait_name) }
       rescue => e
         result |= [FactoryTraitError.new(e, factory, trait_name)]
       end
@@ -106,5 +106,16 @@ module FactoryBot
         :message
       end
     end
+
+    def in_transaction
+      if defined?(ActiveRecord::Base)
+        ActiveRecord::Base.transaction do
+          yield
+          raise ActiveRecord::Rollback
+        end
+      else
+        yield
+      end
+    end
   end
 end

data/lib/factory_bot/sequence.rb

@@ -38,6 +38,17 @@ module FactoryBot
       @value.rewind
     end
 
+    def matches?(test_sequence)
+      return false unless name == test_sequence.name
+      return false unless proc.source_location == test_sequence.proc.source_location
+
+      proc.parameters == test_sequence.proc.parameters
+    end
+
+    protected
+
+    attr_reader :proc
+
     private
 
     def value

data/lib/factory_bot/strategy/stub.rb

@@ -102,12 +102,14 @@ module FactoryBot
       end
 
       def set_timestamps(result_instance)
+        timestamp = Time.current
+
         if missing_created_at?(result_instance)
-          result_instance.created_at = Time.current
+          result_instance.created_at = timestamp
         end
 
         if missing_updated_at?(result_instance)
-          result_instance.updated_at = Time.current
+          result_instance.updated_at = timestamp
         end
       end
 

data/lib/factory_bot/trait.rb

@@ -14,6 +14,10 @@ module FactoryBot
       end
     end
 
+    def clone
+      Trait.new(name, &block)
+    end
+
     delegate :add_callback, :declare_attribute, :to_create, :define_trait, :constructor,
       :callbacks, :attributes, :klass, :klass=, to: :@definition
 

data/lib/factory_bot/version.rb

@@ -1,3 +1,3 @@
 module FactoryBot
-  VERSION = "6.5.0".freeze
+  VERSION = "6.5.2".freeze
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factory_bot
 version: !ruby/object:Gem::Version
-  version: 6.5.0
+  version: 6.5.2
 platform: ruby
 authors:
 - Josh Clayton
 - Joe Ferris
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -238,7 +251,6 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/thoughtbot/factory_bot/blob/main/NEWS.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -253,8 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: factory_bot provides a framework and DSL for defining and using model instance
   factories.