From d73dd22eaf72f2654af7c6d7732b74f608c92f25 Mon Sep 17 00:00:00 2001
From: Guillermo Quezada <meemocol@gmail.com>
Date: Sat, 8 Jan 2022 22:00:35 -0600
Subject: [PATCH] Add eager_load_paths instead of autoload_paths due eager load
 dependency loading

---
 README.md                                                | 7 -------
 lib/solidus_graphql_api/engine.rb                        | 2 +-
 lib/solidus_graphql_api/testing_support/factories.rb     | 9 ---------
 spec/spec_helper.rb                                      | 3 ---
 .../testing_support/factories/address_factory.rb         | 0
 .../testing_support/factories/country_factory.rb         | 0
 .../support}/testing_support/factories/store_factory.rb  | 0
 .../testing_support/factories/taxonomy_factory.rb        | 0
 8 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 lib/solidus_graphql_api/testing_support/factories.rb
 rename {lib/solidus_graphql_api => spec/support}/testing_support/factories/address_factory.rb (100%)
 rename {lib/solidus_graphql_api => spec/support}/testing_support/factories/country_factory.rb (100%)
 rename {lib/solidus_graphql_api => spec/support}/testing_support/factories/store_factory.rb (100%)
 rename {lib/solidus_graphql_api => spec/support}/testing_support/factories/taxonomy_factory.rb (100%)

diff --git a/README.md b/README.md
index e596e302..71e5d019 100644
--- a/README.md
+++ b/README.md
@@ -218,13 +218,6 @@ To run [Rubocop](https://github.com/bbatsov/rubocop) static code analysis run
 bundle exec rubocop
 ```
 
-When testing your application's integration with this extension you may use its factories.
-Simply add this require statement to your spec_helper:
-
-```ruby
-require 'solidus_graphql_api/factories'
-```
-
 ## Running the sandbox
 
 To run this extension in a sandboxed Solidus application, you can run `bin/sandbox`. The path for
diff --git a/lib/solidus_graphql_api/engine.rb b/lib/solidus_graphql_api/engine.rb
index 332c7087..7b95993c 100644
--- a/lib/solidus_graphql_api/engine.rb
+++ b/lib/solidus_graphql_api/engine.rb
@@ -16,7 +16,7 @@ class Engine < Rails::Engine
       g.test_framework :rspec
     end
 
-    config.autoload_paths << File.expand_path('..', __dir__)
+    config.eager_load_paths << File.expand_path('..', __dir__)
 
     initializer "solidus_graphql_api.setup_batch_loader_middleware" do |app|
       app.middleware.use BatchLoader::Middleware
diff --git a/lib/solidus_graphql_api/testing_support/factories.rb b/lib/solidus_graphql_api/testing_support/factories.rb
deleted file mode 100644
index 80933b4d..00000000
--- a/lib/solidus_graphql_api/testing_support/factories.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require 'solidus_graphql_api/testing_support/factories/address_factory'
-require 'solidus_graphql_api/testing_support/factories/country_factory'
-require 'solidus_graphql_api/testing_support/factories/store_factory'
-require 'solidus_graphql_api/testing_support/factories/taxonomy_factory'
-
-FactoryBot.define do
-end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 7ace3875..6ed064f9 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -21,9 +21,6 @@
 # in spec/support/ and its subdirectories.
 Dir["#{__dir__}/support/**/*.rb"].sort.each { |f| require f }
 
-# Requires factories defined in lib/solidus_graphql_api/testing_support/factories.rb
-SolidusDevSupport::TestingSupport::Factories.load_for(SolidusGraphqlApi::Engine)
-
 RSpec.configure do |config|
   config.add_setting :default_freeze_date, default: "21/12/2012 12:00:00"
   config.add_setting :graphql_queries_dir, default: "spec/support/graphql/queries"
diff --git a/lib/solidus_graphql_api/testing_support/factories/address_factory.rb b/spec/support/testing_support/factories/address_factory.rb
similarity index 100%
rename from lib/solidus_graphql_api/testing_support/factories/address_factory.rb
rename to spec/support/testing_support/factories/address_factory.rb
diff --git a/lib/solidus_graphql_api/testing_support/factories/country_factory.rb b/spec/support/testing_support/factories/country_factory.rb
similarity index 100%
rename from lib/solidus_graphql_api/testing_support/factories/country_factory.rb
rename to spec/support/testing_support/factories/country_factory.rb
diff --git a/lib/solidus_graphql_api/testing_support/factories/store_factory.rb b/spec/support/testing_support/factories/store_factory.rb
similarity index 100%
rename from lib/solidus_graphql_api/testing_support/factories/store_factory.rb
rename to spec/support/testing_support/factories/store_factory.rb
diff --git a/lib/solidus_graphql_api/testing_support/factories/taxonomy_factory.rb b/spec/support/testing_support/factories/taxonomy_factory.rb
similarity index 100%
rename from lib/solidus_graphql_api/testing_support/factories/taxonomy_factory.rb
rename to spec/support/testing_support/factories/taxonomy_factory.rb