From 9427f5e94a1454f57d9d765c907866cc79999476 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Tue, 20 Feb 2024 09:29:43 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20Favor=20explicit=20FactoryBot.cr?=
 =?UTF-8?q?eate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In cases where we have `Factory A` that uses the
`FactoryBot.valkyrie_create` strategy, and it calls `create(:user)`, the
`create(:user)` uses the `valkyrie_create` strategy; which causes
problems.

This change favors the explicit `FactoryBot.create` call to be specific
about the strategy instead of implicit.
---
 spec/factories/admin_sets_lw.rb       | 4 ++--
 spec/factories/administrative_sets.rb | 2 +-
 spec/factories/collections.rb         | 6 +++---
 spec/factories/collections_factory.rb | 6 +++---
 spec/factories/file_sets.rb           | 2 +-
 spec/factories/generic_works.rb       | 2 +-
 spec/factories/hyrax_collection.rb    | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/spec/factories/admin_sets_lw.rb b/spec/factories/admin_sets_lw.rb
index 926c313dee..9803986cef 100644
--- a/spec/factories/admin_sets_lw.rb
+++ b/spec/factories/admin_sets_lw.rb
@@ -57,7 +57,7 @@
 
   factory :adminset_lw, class: AdminSet do
     transient do
-      user { create(:user) }
+      user { FactoryBot.create(:user) }
 
       with_permission_template { false }
       with_solr_document { false }
@@ -105,7 +105,7 @@
     # Builds a pre-Hyrax 2.1.0 adminset without edit/view grants on the admin set.
     # Do not use with create because the save will cause the solr grants to be created.
     transient do
-      user { create(:user) }
+      user { FactoryBot.create(:user) }
       with_permission_template { true }
       with_solr_document { true }
     end
diff --git a/spec/factories/administrative_sets.rb b/spec/factories/administrative_sets.rb
index 34a47d3101..0f94f49511 100644
--- a/spec/factories/administrative_sets.rb
+++ b/spec/factories/administrative_sets.rb
@@ -15,7 +15,7 @@
 
     transient do
       with_permission_template { false }
-      user { create(:user) }
+      user { FactoryBot.create(:user) }
       access_grants { [] }
       with_index { true }
     end
diff --git a/spec/factories/collections.rb b/spec/factories/collections.rb
index f1f2e467d7..e91d43d603 100644
--- a/spec/factories/collections.rb
+++ b/spec/factories/collections.rb
@@ -74,7 +74,7 @@
 
   factory :collection_lw, class: Collection do
     transient do
-      user { create(:user) }
+      user { FactoryBot.create(:user) }
 
       collection_type { nil }
       collection_type_settings { nil }
@@ -135,7 +135,7 @@
 
   factory :user_collection_lw, class: Collection do
     transient do
-      user { create(:user) }
+      user { FactoryBot.create(:user) }
       collection_type { create(:user_collection_type) }
     end
 
@@ -151,7 +151,7 @@
     #   col = build(:typeless_collection, ...)
     #   col.save(validate: false)
     transient do
-      user { create(:user) }
+      user { FactoryBot.create(:user) }
       with_permission_template { false }
       do_save { false }
     end
diff --git a/spec/factories/collections_factory.rb b/spec/factories/collections_factory.rb
index 4242562557..febf05d729 100644
--- a/spec/factories/collections_factory.rb
+++ b/spec/factories/collections_factory.rb
@@ -9,7 +9,7 @@
     # rubocop:enable Layout/LineLength
 
     transient do
-      user { create(:user) }
+      user { FactoryBot.create(:user) }
       # allow defaulting to default user collection
       collection_type_settings { nil }
       with_permission_template { false }
@@ -59,7 +59,7 @@
 
   factory :user_collection, class: Collection do
     transient do
-      user { create(:user) }
+      user { FactoryBot.create(:user) }
       collection_type { create(:user_collection_type) }
     end
 
@@ -75,7 +75,7 @@
     #   col = build(:typeless_collection, ...)
     #   col.save(validate: false)
     transient do
-      user { create(:user) }
+      user { FactoryBot.create(:user) }
       with_permission_template { false }
       create_access { false }
       do_save { false }
diff --git a/spec/factories/file_sets.rb b/spec/factories/file_sets.rb
index 40ac07afb2..bd991f85da 100644
--- a/spec/factories/file_sets.rb
+++ b/spec/factories/file_sets.rb
@@ -2,7 +2,7 @@
 FactoryBot.define do
   factory :file_set do
     transient do
-      user { create(:user) }
+      user { FactoryBot.create(:user) }
       content { nil }
     end
     after(:build) do |fs, evaluator|
diff --git a/spec/factories/generic_works.rb b/spec/factories/generic_works.rb
index 54a9c95511..d98f28fd5c 100644
--- a/spec/factories/generic_works.rb
+++ b/spec/factories/generic_works.rb
@@ -3,7 +3,7 @@
 FactoryBot.define do
   factory :work, aliases: [:generic_work, :private_generic_work], class: 'GenericWork' do
     transient do
-      user { create(:user) }
+      user { FactoryBot.create(:user) }
       # Set to true (or a hash) if you want to create an admin set
       with_admin_set { false }
     end
diff --git a/spec/factories/hyrax_collection.rb b/spec/factories/hyrax_collection.rb
index 9cfddaa5c2..97334f385a 100644
--- a/spec/factories/hyrax_collection.rb
+++ b/spec/factories/hyrax_collection.rb
@@ -19,7 +19,7 @@
       with_permission_template { true }
       collection_type { nil }
       with_index { true }
-      user { create(:user) }
+      user { FactoryBot.create(:user) }
       edit_groups { [] }
       edit_users { [] }
       read_groups { [] }