factory_bot 6.0.2 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53cbce42f9c9fcf243a4081288b73cfce66a6b75a323f6882d6be4b4f60fcd18
-  data.tar.gz: 68df68b5a4501caa97f8e2538e3d1afb6e8ae619add80a52fff7bef2f8bda24b
+  metadata.gz: 3bcbbd8bee01abdb25a5cfdbbbbca29396f587236f0c20f8300adbf6e32f783c
+  data.tar.gz: 94d8e73507ae61edba7fb3129ee74c4fe9998a8fb78614ecba9966199561c8e4
 SHA512:
-  metadata.gz: '049104e865666570343adea5fd54e3025d5c4b550c7a364b22e4f9af8f24c8055e2fc21a168e752976569617bd0e4d02504904eb7274d7c7819d32936c164610'
-  data.tar.gz: 2bf0447a30a2e536f9eeaaccc724528c839a576ce0df7490f68ec86e683273a50e58ae5f7171c4e001c323adb8fe793427106dbcdc68987dc6ff28d3a4608d6f
+  metadata.gz: e97d9530810f0de00f6e0129df37db52722ee8d430f7b118ffdcebdc0eecc1e1532356b7c8e01cc85265c04f18eb174d3d5ff09fe235c5f30ceb7b5e16432508
+  data.tar.gz: 71b77c30b16c89588d6946505be547374321597e8e16f89673766cda94b22188dc28070a34144ae126dad93042de0173e1d92173237ae1e929a3131e85569a51

data/CONTRIBUTING.md

@@ -51,6 +51,12 @@ Here are some ways *you* can contribute:
   asking for help. We love helping!
 * Please don't update the Gem version.
 
+## Setting up
+
+```sh
+bundle install
+```
+
 ## Running the test suite
 
 The default rake task will run the full test suite and [standard]:

data/GETTING_STARTED.md

@@ -37,12 +37,15 @@ Getting Started
 * [Associations](#associations)
   + [Implicit definition](#implicit-definition)
   + [Explicit definition](#explicit-definition)
+  + [Inline definition](#inline-definition)
   + [Specifying the factory](#specifying-the-factory)
   + [Overriding attributes](#overriding-attributes)
+  + [Association overrides](#association-overrides)
   + [Build strategies](#build-strategies-1)
   + [`has_many` associations](#has_many-associations)
   + [`has_and_belongs_to_many` associations](#has_and_belongs_to_many-associations)
   + [Polymorphic associations](#polymorphic-associations)
+  + [Interconnected associations](#interconnected-associations)
 * [Sequences](#sequences)
   + [Global sequences](#global-sequences)
   + [With dynamic attributes](#with-dynamic-attributes)
@@ -52,6 +55,7 @@ Getting Started
   + [Without a block](#without-a-block)
   + [Aliases](#aliases-1)
   + [Rewinding](#rewinding)
+  + [Uniqueness](#uniqueness)
 * [Traits](#traits)
   + [Defining traits](#defining-traits)
   + [As implicit attributes](#as-implicit-attributes-1)
@@ -196,17 +200,15 @@ It is also possible to explicitly specify the class:
 
 ```ruby
 # This will use the User class (otherwise Admin would have been guessed)
-factory :admin, class: User
+factory :admin, class: "User"
 ```
 
-If the constant is not available
-(if you are using a Rails engine that waits to load models, for example),
-you can also pass a symbol or string,
-which factory\_bot will constantize later, once you start building objects:
+You can pass a constant as well, if the constant is available (note that this
+can cause test performance problems in large Rails applications, since
+referring to the constant will cause it to be eagerly loaded).
 
 ```ruby
-# It's OK if Doorkeeper::AccessToken isn't loaded yet
-factory :access_token, class: "Doorkeeper::AccessToken"
+factory :access_token, class: User
 ```
 
 ### Hash attributes
@@ -311,17 +313,17 @@ factory :user, aliases: [:author, :commenter] do
 end
 
 factory :post do
-  author
-  # instead of
+  # The alias allows us to write author instead of
   # association :author, factory: :user
+  author
   title { "How to read a book effectively" }
   body { "There are five steps involved." }
 end
 
 factory :comment do
-  commenter
-  # instead of
+  # The alias allows us to write commenter instead of
   # association :commenter, factory: :user
+  commenter
   body { "Great article!" }
 end
 ```
@@ -345,6 +347,7 @@ create(:user, last_name: "Doe").email
 
 Transient Attributes
 --------------------
+Transient attributes are attributes only available within the factory definition, and not set on the object being built. This allows for more complex logic inside factories.
 
 ### With other attributes
 
@@ -504,6 +507,19 @@ factory :post do
 end
 ```
 
+### Inline definition
+
+You can also define associations inline within regular attributes,
+but note that the value will be `nil`
+when using the `attributes_for` strategy.
+
+```ruby
+factory :post do
+  # ...
+  author { association :author }
+end
+```
+
 ### Specifying the factory
 
 You can specify a different factory (although [Aliases](#aliases) might also
@@ -527,6 +543,15 @@ factory :post do
 end
 ```
 
+Inline:
+
+```ruby
+factory :post do
+  # ...
+  author { association :user }
+end
+```
+
 ### Overriding attributes
 
 You can also override attributes.
@@ -550,6 +575,35 @@ factory :post do
 end
 ```
 
+Or inline using attributes from the factory:
+
+```rb
+factory :post do
+  # ...
+  author_last_name { "Writely" }
+  author { association :author, last_name: author_last_name }
+end
+```
+
+### Association overrides
+
+Attribute overrides can be used to link associated objects:
+
+```ruby
+FactoryBot.define do
+  factory :author do
+    name { 'Taylor' }
+  end
+
+  factory :post do
+    author
+  end
+end
+
+eunji = build(:author, name: 'Eunji')
+post = build(:post, author: eunji)
+```
+
 ### Build strategies
 
 In factory\_bot 5, associations default to using the same build strategy as
@@ -619,27 +673,51 @@ factory :post do
 
 ### `has_many` associations
 
-Generating data for a `has_many` relationship is a bit more involved,
-depending on the amount of flexibility desired, but here's a surefire example
-of generating associated data.
+There are a few ways to generate data for a `has_many` relationship. The
+simplest approach is to write a helper method in plain Ruby to tie together the
+different records:
 
 ```ruby
 FactoryBot.define do
+  factory :post do
+    title { "Through the Looking Glass" }
+    user
+  end
 
-  # post factory with a `belongs_to` association for the user
+  factory :user do
+    name { "Rachel Sanchez" }
+  end
+end
+
+def user_with_posts(posts_count: 5)
+  FactoryBot.create(:user) do |user|
+    FactoryBot.create_list(:post, posts_count, user: user)
+  end
+end
+
+create(:user).posts.length # 0
+user_with_posts.posts.length # 5
+user_with_posts(posts_count: 15).posts.length # 15
+```
+
+If you prefer to keep the object creation fully within factory\_bot, you can
+build the posts in an `after(:create)` callback.
+
+
+```ruby
+FactoryBot.define do
   factory :post do
     title { "Through the Looking Glass" }
     user
   end
 
-  # user factory without associated posts
   factory :user do
     name { "John Doe" }
 
     # user_with_posts will create post data after the user has been created
     factory :user_with_posts do
-      # posts_count is declared as a transient attribute and available in
-      # attributes on the factory, as well as the callback via the evaluator
+      # posts_count is declared as a transient attribute available in the
+      # callback via the evaluator
       transient do
         posts_count { 5 }
       end
@@ -650,71 +728,122 @@ FactoryBot.define do
       # to create and we make sure the user is associated properly to the post
       after(:create) do |user, evaluator|
         create_list(:post, evaluator.posts_count, user: user)
+
+        # You may need to reload the record here, depending on your application
+        user.reload
       end
     end
   end
 end
+
+create(:user).posts.length # 0
+create(:user_with_posts).posts.length # 5
+create(:user_with_posts, posts_count: 15).posts.length # 15
 ```
 
-This allows us to do:
+Or, for a solution that works with `build`, `build_stubbed`, and `create`
+(although it doesn't work well with `attributes_for`), you can use inline
+associations:
 
 ```ruby
+FactoryBot.define do
+  factory :post do
+    title { "Through the Looking Glass" }
+    user
+  end
+
+  factory :user do
+    name { "Taylor Kim" }
+
+    factory :user_with_posts do
+      posts { [association(:post)] }
+    end
+  end
+end
+
 create(:user).posts.length # 0
+create(:user_with_posts).posts.length # 1
+build(:user_with_posts).posts.length # 1
+build_stubbed(:user_with_posts).posts.length # 1
+```
+
+For more flexibility you can combine this with the `posts_count` transient
+attribute from the callback example:
+
+```ruby
+FactoryBot.define do
+  factory :post do
+    title { "Through the Looking Glass" }
+    user
+  end
+
+  factory :user do
+    name { "Adiza Kumato" }
+
+    factory :user_with_posts do
+      transient do
+        posts_count { 5 }
+      end
+
+      posts do
+        Array.new(posts_count) { association(:post) }
+      end
+    end
+  end
+end
+
 create(:user_with_posts).posts.length # 5
 create(:user_with_posts, posts_count: 15).posts.length # 15
+build(:user_with_posts, posts_count: 15).posts.length # 15
+build_stubbed(:user_with_posts, posts_count: 15).posts.length # 15
 ```
 
 ### `has_and_belongs_to_many` associations
 
 Generating data for a `has_and_belongs_to_many` relationship is very similar
-to the above `has_many` relationship, with a small change, you need to pass an
+to the above `has_many` relationship, with a small change: you need to pass an
 array of objects to the model's pluralized attribute name rather than a single
 object to the singular version of the attribute name.
 
-Here's an example with two models that are related via
- `has_and_belongs_to_many`:
 
 ```ruby
-FactoryBot.define do
-
-  # language factory with a `belongs_to` association for the profile
-  factory :language do
-    title { "Through the Looking Glass" }
-    profile
+def profile_with_languages(languages_count: 2)
+  FactoryBot.create(:profile) do |profile|
+    FactoryBot.create_list(:language, languages_count, profiles: [profile])
   end
+end
+```
 
-  # profile factory without associated languages
-  factory :profile do
-    name { "John Doe" }
+Or with the callback approach:
 
-    # profile_with_languages will create language data after the profile has
-    # been created
-    factory :profile_with_languages do
-      # languages_count is declared as an ignored attribute and available in
-      # attributes on the factory, as well as the callback via the evaluator
-      transient do
-        languages_count { 5 }
-      end
+```ruby
+factory :profile_with_languages do
+  transient do
+    languages_count { 2 }
+  end
 
-      # the after(:create) yields two values; the profile instance itself and
-      # the evaluator, which stores all values from the factory, including
-      # ignored attributes; `create_list`'s second argument is the number of
-      # records to create and we make sure the profile is associated properly
-      # to the language
-      after(:create) do |profile, evaluator|
-        create_list(:language, evaluator.languages_count, profiles: [profile])
-      end
-    end
+  after(:create) do |profile, evaluator|
+    create_list(:language, evaluator.languages_count, profiles: [profile])
+    profile.reload
   end
 end
 ```
 
-This allows us to do:
+Or the inline association approach (note the use of the `instance` method here
+to refer to the profile being built):
 
 ```ruby
-create(:profile).languages.length # 0
-create(:profile_with_languages).languages.length # 5
-create(:profile_with_languages, languages_count: 15).languages.length # 15
+factory :profile_with_languages do
+  transient do
+    languages_count { 2 }
+  end
+
+  languages do
+    Array.new(languages_count) do
+      association(:language, profiles: [instance])
+    end
+  end
+end
 ```
 
 ### Polymorphic associations
@@ -748,6 +877,61 @@ create(:comment, :for_video)
 create(:comment, :for_photo)
 ```
 
+### Interconnected associations
+
+There are limitless ways objects might be interconnected, and
+factory\_bot may not always be suited to handle those relationships. In some
+cases it makes sense to use factory\_bot to build each individual object, and
+then to write helper methods in plain Ruby to tie those objects together.
+
+That said, some more complex, interconnected relationships can be built in factory\_bot
+using inline associations with reference to the `instance` being built.
+
+Let's say your models look like this, where an associated `Student` and
+`Profile` should both belong to the same `School`:
+
+```ruby
+class Student < ApplicationRecord
+  belongs_to :school
+  has_one :profile
+end
+
+class Profile < ApplicationRecord
+  belongs_to :school
+  belongs_to :student
+end
+
+class School < ApplicationRecord
+  has_many :students
+  has_many :profiles
+end
+```
+
+We can ensure the student and profile are connected to each other and to the
+same school with a factory like this:
+
+```ruby
+FactoryBot.define do
+  factory :student do
+    school
+    profile { association :profile, student: instance, school: school }
+  end
+
+  factory :profile do
+    school
+    student { association :student, profile: instance, school: school }
+  end
+
+  factory :school
+end
+```
+
+Note that this approach works with `build`, `build_stubbed`, and `create`, but
+the associations will return `nil` when using `attributes_for`.
+
+Also, note that if you assign any attributes inside a custom `initialize_with` 
+(e.g. `initialize_with { new(**attributes) }`), those attributes should not refer to `instance`,
+since it will be `nil`.
 
 Sequences
 ---------
@@ -810,7 +994,7 @@ end
 
 ### Initial value
 
-You can override the initial value. Any value that response to the `#next`
+You can override the initial value. Any value that responds to the `#next`
 method will work (e.g. 1, 2, 3, 'a', 'b', 'c')
 
 ```ruby
@@ -829,6 +1013,15 @@ factory :post do
 end
 ```
 
+Please note, that the value for the sequence could be any Enumerable instance,
+as long as it responds to `#next`:
+
+```ruby
+factory :task do
+  sequence :priority, %i[low medium high urgent].cycle
+end
+```
+
 ### Aliases
 
 Sequences can also have aliases. The sequence aliases share the same counter:
@@ -878,6 +1071,22 @@ generate(:email) # "person1@example.com"
 
 This rewinds all registered sequences.
 
+### Uniqueness
+
+When working with uniqueness constraints, be careful not to pass in override values that will conflict with the generated sequence values.
+
+In this example the email will be the same for both users. If email must be unique, this code will error:
+
+```rb
+factory :user do
+  sequence(:email) { |n| "person#{n}@example.com" }
+end
+
+FactoryBot.create(:user, email: "person1@example.com")
+FactoryBot.create(:user)
+```
+
+
 Traits
 ------
 
@@ -943,16 +1152,16 @@ factory :user do
   name { "Friendly User" }
   login { name }
 
-  trait :male do
+  trait :active do
     name { "John Doe" }
-    gender { "Male" }
-    login { "#{name} (M)" }
+    status { :active }
+    login { "#{name} (active)" }
   end
 
-  trait :female do
+  trait :inactive do
     name { "Jane Doe" }
-    gender { "Female" }
-    login { "#{name} (F)" }
+    status { :inactive }
+    login { "#{name} (inactive)" }
   end
 
   trait :admin do
@@ -960,8 +1169,8 @@ factory :user do
     login { "admin-#{name}" }
   end
 
-  factory :male_admin,   traits: [:male, :admin]   # login will be "admin-John Doe"
-  factory :female_admin, traits: [:admin, :female] # login will be "Jane Doe (F)"
+  factory :active_admin,   traits: [:active, :admin]   # login will be "admin-John Doe"
+  factory :inactive_admin, traits: [:admin, :inactive] # login will be "Jane Doe (inactive)"
 end
 ```
 
@@ -974,19 +1183,41 @@ factory :user do
   name { "Friendly User" }
   login { name }
 
-  trait :male do
+  trait :active do
     name { "John Doe" }
-    gender { "Male" }
+    status { :active }
     login { "#{name} (M)" }
   end
 
   factory :brandon do
-    male
+    active
     name { "Brandon" }
   end
 end
 ```
 
+### As mixins
+
+Traits can be defined outside of factories and used as mixins to compose shared attributes
+
+```ruby
+FactoryBot.define do
+  trait :timestamps do
+    created_at { 8.days.ago }
+    updated_at { 4.days.ago }
+  end
+  
+  factory :user, traits: [:timestamps] do
+    username { "john_doe" }
+  end
+  
+  factory :post do
+    timestamps
+    title { "Traits rock" }
+  end
+end
+```
+
 ### Using traits
 
 Traits can also be passed in as a list of symbols when you construct an instance
@@ -996,9 +1227,9 @@ from factory\_bot.
 factory :user do
   name { "Friendly User" }
 
-  trait :male do
+  trait :active do
     name { "John Doe" }
-    gender { "Male" }
+    status { :active }
   end
 
   trait :admin do
@@ -1006,8 +1237,8 @@ factory :user do
   end
 end
 
-# creates an admin user with gender "Male" and name "Jon Snow"
-create(:user, :admin, :male, name: "Jon Snow")
+# creates an admin user with :active status and name "Jon Snow"
+create(:user, :admin, :active, name: "Jon Snow")
 ```
 
 This ability works with `build`, `build_stubbed`, `attributes_for`, and `create`.
@@ -1025,8 +1256,8 @@ factory :user do
   end
 end
 
-# creates 3 admin users with gender "Male" and name "Jon Snow"
-create_list(:user, 3, :admin, :male, name: "Jon Snow")
+# creates 3 admin users with :active status and name "Jon Snow"
+create_list(:user, 3, :admin, :active, name: "Jon Snow")
 ```
 
 ### With associations
@@ -1325,7 +1556,6 @@ FactoryBot.define do
   factory :application_user, parent: :user do
     full_name { "Jane Doe" }
     date_of_birth { 21.years.ago }
-    gender { "Female" }
     health { 90 }
   end
 end
@@ -1338,7 +1568,6 @@ FactoryBot.modify do
   factory :user do
     full_name { "Jane Doe" }
     date_of_birth { 21.years.ago }
-    gender { "Female" }
     health { 90 }
   end
 end
@@ -1376,6 +1605,15 @@ twenty_somethings = build_list(:user, 10) do |user, i|
 end
 ```
 
+`create_list` passes saved instances into the block. If you modify the instance, you must save it again:
+
+```ruby
+twenty_somethings = create_list(:user, 10) do |user, i|
+  user.date_of_birth = (20 + i).years.ago
+  user.save!
+end
+```
+
 `build_stubbed_list` will give you fully stubbed out instances:
 
 ```ruby
@@ -1550,7 +1788,7 @@ factory :user do
 
   name "John Doe"
 
-  initialize_with { new(attributes) }
+  initialize_with { new(**attributes) }
 end
 ```
 

data/NEWS.md

@@ -1,5 +1,22 @@
 # News
 
+## 6.2.1 (March 8, 2022)
+  * Added: CI testing against truffleruby
+  * Changed: Documentation improvements for sequences and traits
+  * Fixed: ActiveSupport::Notifications reporting strategy through associations now report as symbols
+  * Fixed: `add_attribute` with reserved keywords assigns values correctly
+
+## 6.2.0 (May 7, 2021)
+  * Added: support for Ruby 3.0
+  * Changed: Include factory or trait name in error messages for missing traits. d05a9a3c
+  * Changed: Switched from Travis CI to GitHub Actions
+  * Fixed: More Ruby 2.7 kwarg deprecation warnings
+
+## 6.1.0 (July 8, 2020)
+  * Added: public reader for the evaluation instance, helpful for building interrelated associations
+  * Changed: raise a more helpful error when passing an invalid argument to an association
+  * Fixed: Ruby 2.7 kwarg deprecation warnings
+
 ## 6.0.2 (June 19, 2020)
   * Fixed: bug causing traits to consume more memory each time they were used
 
@@ -8,10 +25,14 @@
 
 ## 6.0.0 (June 18, 2020)
   * Added: automatic definition of traits for Active Record enum attributes, enabled by default
+    (Note that this required changing where factory_bot constantizes the build
+     class, which may affect applications that were using abstract factories for
+     inheritance. See issue #1409.)
   * Added: `traits_for_enum` method to define traits for non-Active Record enums
   * Added: `build_stubbed_starting_id=` option to define the starting id for `build_stubbed`
   * Removed: deprecated methods on the top-level `FactoryBot` module meant only for internal use
   * Removed: support for EOL versions of Ruby (2.3, 2.4) and Rails (4.2)
+  * Removed: support for "abstract" factories with no associated class; use traits instead.
 
 ## 5.2.0 (April 24, 2020)
   * Added: Pass index to block for `*_list` methods

data/README.md

@@ -1,4 +1,4 @@
-# factory_bot [![Build Status][ci-image]][ci] [![Code Climate][grade-image]][grade] [![Gem Version][version-image]][version] [![Reviewed by Hound][hound-badge-image]][hound]
+# factory_bot [![Build Status][ci-image]][ci] [![Code Climate][grade-image]][grade] [![Gem Version][version-image]][version]
 
 factory_bot 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.
 
@@ -43,13 +43,7 @@ gem install factory_bot
 Supported Ruby versions
 -----------------------
 
-The factory_bot 5.x series supports MRI Ruby 2.3+.
-
-The factory_bot 3.x+ series supports MRI Ruby 1.9. Additionally, factory_bot
-3.6+ supports JRuby 1.6.7.2+ while running in 1.9 mode. See [GETTING_STARTED]
-for more information on configuring the JRuby environment.
-
-For versions of Ruby prior to 1.9, please use factory_bot 2.x.
+Supported Ruby versions are listed in [`.github/workflows/build.yml`](https://github.com/thoughtbot/factory_bot/blob/master/.github/workflows/build.yml)
 
 More Information
 ----------------
@@ -100,8 +94,8 @@ See [our other projects][community] or
 
 [community]: https://thoughtbot.com/community?utm_source=github
 [hire]: https://thoughtbot.com/hire-us?utm_source=github
-[ci-image]: https://travis-ci.org/thoughtbot/factory_bot.svg
-[ci]: https://travis-ci.org/thoughtbot/factory_bot?branch=master
+[ci-image]: https://github.com/thoughtbot/factory_bot/actions/workflows/build.yml/badge.svg
+[ci]: https://github.com/thoughtbot/factory_bot/actions?query=workflow%3A.github%2Fworkflows%2Fbuild.yml+branch%3Amaster++
 [grade-image]: https://codeclimate.com/github/thoughtbot/factory_bot/badges/gpa.svg
 [grade]: https://codeclimate.com/github/thoughtbot/factory_bot
 [version-image]: https://badge.fury.io/rb/factory_bot.svg

data/lib/factory_bot/aliases.rb

@@ -10,7 +10,7 @@ module FactoryBot
 
   def self.aliases_for(attribute)
     aliases.map { |(pattern, replace)|
-      if pattern.match(attribute.to_s)
+      if pattern.match?(attribute)
         attribute.to_s.sub(pattern, replace).to_sym
       end
     }.compact << attribute

data/lib/factory_bot/attribute/dynamic.rb

@@ -12,7 +12,7 @@ module FactoryBot
 
         -> {
           value = case block.arity
-                  when 1, -1 then instance_exec(self, &block)
+                  when 1, -1, -2 then instance_exec(self, &block)
                   else instance_exec(&block)
           end
           raise SequenceAbuseError if FactoryBot::Sequence === value

data/lib/factory_bot/attribute_assigner.rb

@@ -37,8 +37,9 @@ module FactoryBot
     end
 
     def decorated_evaluator
-      Decorator::InvocationTracker.new(
-        Decorator::NewConstructor.new(@evaluator, @build_class)
+      Decorator::NewConstructor.new(
+        Decorator::InvocationTracker.new(@evaluator),
+        @build_class
       )
     end
 

data/lib/factory_bot/callback.rb

@@ -9,7 +9,7 @@ module FactoryBot
 
     def run(instance, evaluator)
       case block.arity
-      when 1, -1 then syntax_runner.instance_exec(instance, &block)
+      when 1, -1, -2 then syntax_runner.instance_exec(instance, &block)
       when 2 then syntax_runner.instance_exec(instance, evaluator, &block)
       else syntax_runner.instance_exec(&block)
       end

data/lib/factory_bot/declaration/association.rb

@@ -6,6 +6,7 @@ module FactoryBot
         super(name, false)
         @options = options.dup
         @overrides = options.extract_options!
+        @factory_name = @overrides.delete(:factory) || name
         @traits = options
       end
 
@@ -21,20 +22,36 @@ module FactoryBot
 
       private
 
+      attr_reader :factory_name, :overrides, :traits
+
       def build
-        ensure_factory_is_not_a_declaration!
+        raise_if_arguments_are_declarations!
 
-        factory_name = @overrides[:factory] || name
-        [Attribute::Association.new(name, factory_name, [@traits, @overrides.except(:factory)].flatten)]
+        [
+          Attribute::Association.new(
+            name,
+            factory_name,
+            [traits, overrides].flatten
+          )
+        ]
       end
 
-      def ensure_factory_is_not_a_declaration!
-        if @overrides[:factory].is_a?(Declaration)
+      def raise_if_arguments_are_declarations!
+        if factory_name.is_a?(Declaration)
           raise ArgumentError.new(<<~MSG)
             Association '#{name}' received an invalid factory argument.
-            Did you mean? 'factory: :#{@overrides[:factory].name}'
+            Did you mean? 'factory: :#{factory_name.name}'
           MSG
         end
+
+        overrides.each do |attribute, value|
+          if value.is_a?(Declaration)
+            raise ArgumentError.new(<<~MSG)
+              Association '#{name}' received an invalid attribute override.
+              Did you mean? '#{attribute}: :#{value.name}'
+            MSG
+          end
+        end
       end
     end
   end

data/lib/factory_bot/decorator/invocation_tracker.rb

@@ -10,6 +10,7 @@ module FactoryBot
         @invoked_methods << name
         super
       end
+      ruby2_keywords :method_missing if respond_to?(:ruby2_keywords, true)
 
       def __invoked_methods__
         @invoked_methods.uniq

data/lib/factory_bot/decorator.rb

@@ -6,18 +6,30 @@ module FactoryBot
       @component = component
     end
 
-    def method_missing(name, *args, &block) # rubocop:disable Style/MethodMissingSuper
-      @component.send(name, *args, &block)
+    if ::Gem::Version.new(::RUBY_VERSION) >= ::Gem::Version.new("2.7")
+      class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
+          def method_missing(...) # rubocop:disable Style/MethodMissingSuper, Style/MissingRespondToMissing
+          @component.send(...)
+        end
+
+        def send(...)
+          __send__(...)
+        end
+      RUBY
+    else
+      def method_missing(name, *args, &block) # rubocop:disable Style/MissingRespondToMissing
+        @component.send(name, *args, &block)
+      end
+
+      def send(symbol, *args, &block)
+        __send__(symbol, *args, &block)
+      end
     end
 
     def respond_to_missing?(name, include_private = false)
       @component.respond_to?(name, true) || super
     end
 
-    def send(symbol, *args, &block)
-      __send__(symbol, *args, &block)
-    end
-
     def self.const_missing(name)
       ::Object.const_get(name)
     end

data/lib/factory_bot/definition.rb

@@ -30,7 +30,7 @@ module FactoryBot
     end
 
     def to_create(&block)
-      if block_given?
+      if block
         @to_create = block
       else
         aggregate_from_traits_and_self(:to_create) { @to_create }.last
@@ -111,6 +111,20 @@ module FactoryBot
 
     def base_traits
       @base_traits.map { |name| trait_by_name(name) }
+    rescue KeyError => error
+      raise error_with_definition_name(error)
+    end
+
+    def error_with_definition_name(error)
+      message = error.message
+      message.insert(
+        message.index("\nDid you mean?") || message.length,
+        " referenced within \"#{name}\" definition"
+      )
+
+      error.class.new(message).tap do |new_error|
+        new_error.set_backtrace(error.backtrace)
+      end
     end
 
     def additional_traits

data/lib/factory_bot/definition_proxy.rb

@@ -88,7 +88,7 @@ module FactoryBot
     #   end
     #
     # are equivalent.
-    def method_missing(name, *args, &block) # rubocop:disable Style/MissingRespondToMissing, Style/MethodMissingSuper
+    def method_missing(name, *args, &block) # rubocop:disable Style/MissingRespondToMissing
       association_options = args.first
 
       if association_options.nil?

data/lib/factory_bot/evaluator.rb

@@ -24,7 +24,7 @@ module FactoryBot
     def association(factory_name, *traits_and_overrides)
       overrides = traits_and_overrides.extract_options!
       strategy_override = overrides.fetch(:strategy) {
-        FactoryBot.use_parent_strategy ? @build_strategy.class : :create
+        FactoryBot.use_parent_strategy ? @build_strategy.to_sym : :create
       }
 
       traits_and_overrides += [overrides.except(:strategy)]
@@ -33,15 +33,16 @@ module FactoryBot
       @build_strategy.association(runner)
     end
 
-    attr_writer :instance
+    attr_accessor :instance
 
-    def method_missing(method_name, *args, &block) # rubocop:disable Style/MethodMissingSuper
+    def method_missing(method_name, *args, &block)
       if @instance.respond_to?(method_name)
         @instance.send(method_name, *args, &block)
       else
         SyntaxRunner.new.send(method_name, *args, &block)
       end
     end
+    ruby2_keywords :method_missing if respond_to?(:ruby2_keywords, true)
 
     def respond_to_missing?(method_name, _include_private = false)
       @instance.respond_to?(method_name) || SyntaxRunner.new.respond_to?(method_name)

data/lib/factory_bot/registry.rb

@@ -25,7 +25,7 @@ module FactoryBot
       raise key_error_with_custom_message(e)
     end
 
-    alias [] find
+    alias_method :[], :find
 
     def register(name, item)
       @items[name] = item

data/lib/factory_bot/strategy/attributes_for.rb

@@ -8,6 +8,10 @@ module FactoryBot
       def result(evaluation)
         evaluation.hash
       end
+
+      def to_sym
+        :attributes_for
+      end
     end
   end
 end

data/lib/factory_bot/strategy/build.rb

@@ -10,6 +10,10 @@ module FactoryBot
           evaluation.notify(:after_build, instance)
         end
       end
+
+      def to_sym
+        :build
+      end
     end
   end
 end

data/lib/factory_bot/strategy/create.rb

@@ -13,6 +13,10 @@ module FactoryBot
           evaluation.notify(:after_create, instance)
         end
       end
+
+      def to_sym
+        :create
+      end
     end
   end
 end

data/lib/factory_bot/strategy/null.rb

@@ -6,6 +6,10 @@ module FactoryBot
 
       def result(evaluation)
       end
+
+      def to_sym
+        :null
+      end
     end
   end
 end

data/lib/factory_bot/strategy/stub.rb

@@ -41,6 +41,10 @@ module FactoryBot
         end
       end
 
+      def to_sym
+        :stub
+      end
+
       private
 
       def next_id

data/lib/factory_bot/syntax/default.rb

@@ -15,7 +15,7 @@ module FactoryBot
         def factory(name, options = {}, &block)
           factory = Factory.new(name, options)
           proxy = FactoryBot::DefinitionProxy.new(factory.definition)
-          proxy.instance_eval(&block) if block_given?
+          proxy.instance_eval(&block) if block
 
           Internal.register_factory(factory)
 

data/lib/factory_bot/trait.rb

@@ -9,7 +9,7 @@ module FactoryBot
       @definition = Definition.new(@name)
       proxy = FactoryBot::DefinitionProxy.new(@definition)
 
-      if block_given?
+      if block
         proxy.instance_eval(&@block)
       end
     end

data/lib/factory_bot/version.rb

@@ -1,3 +1,3 @@
 module FactoryBot
-  VERSION = "6.0.2".freeze
+  VERSION = "6.2.1".freeze
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: factory_bot
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.2.1
 platform: ruby
 authors:
 - Josh Clayton
 - Joe Ferris
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-20 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -237,7 +237,7 @@ homepage: https://github.com/thoughtbot/factory_bot
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -252,8 +252,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: factory_bot provides a framework and DSL for defining and using model instance
   factories.