Merge branch 'fix-factorybot-ce' into 'master'

Move FactoryBot 4.x syntax config to CE

Closes #33203

See merge request gitlab-org/gitlab!18006

ee/spec/support/factory_bot.rb

@@ -6,9 +6,5 @@ RSpec.configure do |config|
       Rails.root.join('ee', 'spec', 'factories')
     ]
     FactoryBot.find_definitions
-
-    # Use FactoryBot 4.x behavior:
-    # https://github.com/thoughtbot/factory_bot/blob/master/GETTING_STARTED.md#associations
-    FactoryBot.use_parent_strategy = false
   end
 end

spec/spec_helper.rb

@@ -350,6 +350,10 @@ FactoryBot::SyntaxRunner.class_eval do
   include RSpec::Mocks::ExampleMethods
 end
 
+# Use FactoryBot 4.x behavior:
+# https://github.com/thoughtbot/factory_bot/blob/master/GETTING_STARTED.md#associations
+FactoryBot.use_parent_strategy = false
+
 ActiveRecord::Migration.maintain_test_schema!
 
 Shoulda::Matchers.configure do |config|