Fix factory loading

.rubocop.yml

@@ -75,10 +75,6 @@ Layout/ElseAlignment:
 Layout/EmptyLineAfterMagicComment:
   Enabled: false
 
-Layout/EmptyLinesAroundAccessModifier:
-  Exclude:
-    - lib/alchemy/test_support/factories/*.rb
-
 Layout/FirstArrayElementIndentation:
   Enabled: false
 

spec/models/alchemy/json_api/element_spec.rb

@@ -1,5 +1,4 @@
 require "rails_helper"
-require "alchemy/test_support/factories"
 
 RSpec.describe Alchemy::JsonApi::Element, type: :model do
   it { should belong_to(:page).class_name("Alchemy::JsonApi::Page") }

spec/models/alchemy/json_api/page_spec.rb

@@ -1,5 +1,4 @@
 require "rails_helper"
-require "alchemy/test_support/factories"
 
 RSpec.describe Alchemy::JsonApi::Page, type: :model do
   it { should belong_to(:language).class_name("Alchemy::Language") }

spec/rails_helper.rb

@@ -18,6 +18,17 @@
   end
 end
 
+require "alchemy/version"
+if Alchemy.gem_version >= Gem::Version.new("5.2.0")
+  require "factory_bot"
+  require "alchemy/test_support"
+
+  FactoryBot.definition_file_paths.concat(Alchemy::TestSupport.factory_paths)
+  FactoryBot.reload
+else
+  require "alchemy/test_support/factories"
+end
+
 # Requires supporting ruby files with custom matchers and macros, etc, in
 # spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
 # run as spec files by default. This means that files in spec/support that end

spec/requests/alchemy/json_api/layout_pages_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 require "rails_helper"
-require "alchemy/test_support/factories/page_factory"
-require "alchemy/test_support/factories/element_factory"
 require "alchemy/devise/test_support/factories"
 
 RSpec.describe "Alchemy::JsonApi::LayoutPagesController", type: :request do

spec/requests/alchemy/json_api/pages_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 require "rails_helper"
-require "alchemy/test_support/factories/page_factory"
-require "alchemy/test_support/factories/element_factory"
 require "alchemy/devise/test_support/factories"
 require "alchemy/version"
 

spec/serializers/alchemy/json_api/element_serializer_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "rails_helper"
-require "alchemy/test_support/factories"
 
 RSpec.describe Alchemy::JsonApi::ElementSerializer do
   let(:element) do

spec/serializers/alchemy/json_api/essence_boolean_serializer_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "rails_helper"
-require "alchemy/test_support/factories"
 
 RSpec.describe Alchemy::JsonApi::EssenceBooleanSerializer do
   let(:element) { FactoryBot.create(:alchemy_element) }

spec/serializers/alchemy/json_api/essence_date_serializer_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "rails_helper"
-require "alchemy/test_support/factories"
 
 RSpec.describe Alchemy::JsonApi::EssenceDateSerializer do
   let(:today) { Date.today }

spec/serializers/alchemy/json_api/essence_file_serializer_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "rails_helper"
-require "alchemy/test_support/factories"
 
 RSpec.describe Alchemy::JsonApi::EssenceFileSerializer do
   let(:element) { FactoryBot.create(:alchemy_element) }

spec/serializers/alchemy/json_api/essence_html_serializer_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "rails_helper"
-require "alchemy/test_support/factories"
 
 RSpec.describe Alchemy::JsonApi::EssenceHtmlSerializer do
   let(:element) { FactoryBot.create(:alchemy_element) }

spec/serializers/alchemy/json_api/essence_link_serializer_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "rails_helper"
-require "alchemy/test_support/factories"
 
 RSpec.describe Alchemy::JsonApi::EssenceLinkSerializer do
   let(:element) { FactoryBot.create(:alchemy_element) }

spec/serializers/alchemy/json_api/essence_node_serializer_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "rails_helper"
-require "alchemy/test_support/factories"
 require "alchemy/essence_node"
 
 RSpec.describe Alchemy::JsonApi::EssenceNodeSerializer do

spec/serializers/alchemy/json_api/essence_page_serializer_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 require "rails_helper"
-require "alchemy/test_support/factories/content_factory"
-require "alchemy/test_support/factories/essence_page_factory"
 
 RSpec.describe Alchemy::JsonApi::EssencePageSerializer do
   let(:element) { FactoryBot.create(:alchemy_element) }

spec/serializers/alchemy/json_api/essence_picture_serializer_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 require "rails_helper"
-require "alchemy/test_support/factories/content_factory"
-require "alchemy/test_support/factories/essence_picture_factory"
 
 RSpec.describe Alchemy::JsonApi::EssencePictureSerializer do
   let(:element) { FactoryBot.create(:alchemy_element) }

spec/serializers/alchemy/json_api/essence_richtext_serializer_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "rails_helper"
-require "alchemy/test_support/factories"
 
 RSpec.describe Alchemy::JsonApi::EssenceRichtextSerializer do
   let(:element) { FactoryBot.create(:alchemy_element) }

spec/serializers/alchemy/json_api/essence_select_serializer_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "rails_helper"
-require "alchemy/test_support/factories"
 
 RSpec.describe Alchemy::JsonApi::EssenceSelectSerializer do
   let(:element) { FactoryBot.create(:alchemy_element) }

spec/serializers/alchemy/json_api/essence_text_serializer_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "rails_helper"
-require "alchemy/test_support/factories"
 
 RSpec.describe Alchemy::JsonApi::EssenceTextSerializer do
   let(:element) { FactoryBot.create(:alchemy_element) }

spec/serializers/alchemy/json_api/language_serializer_spec.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 require "rails_helper"
-require "alchemy/test_support/factories/language_factory"
-require "alchemy/test_support/factories/page_factory"
-require "alchemy/test_support/factories/node_factory"
 
 RSpec.describe Alchemy::JsonApi::LanguageSerializer do
   let(:language) do

spec/serializers/alchemy/json_api/node_serializer_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "rails_helper"
-require "alchemy/test_support/factories"
 
 RSpec.describe Alchemy::JsonApi::NodeSerializer do
   let(:node) do

spec/serializers/alchemy/json_api/page_serializer_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "rails_helper"
-require "alchemy/test_support/factories"
 
 RSpec.describe Alchemy::JsonApi::PageSerializer do
   let(:alchemy_page) do