Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Fixed factory generation in api_resource generator
Damian Legawiec7295b4464fd1
diff --git a/spree/core/lib/generators/spree/api_resource/api_resource_generator.rb b/spree/core/lib/generators/spree/api_resource/api_resource_generator.rbindex 31482a4854..d5c9eedb31 100644--- a/spree/core/lib/generators/spree/api_resource/api_resource_generator.rb+++ b/spree/core/lib/generators/spree/api_resource/api_resource_generator.rb@@ -145,7 +145,12 @@ module Spreeenddef create_factory- template 'factory.rb.tt', "lib/spree/testing_support/factories/#{singular_name}_factory.rb"+ # spec/factories/ is the FactoryBot default scan path that a freshly-+ # generated `rspec:install` + `factory_bot_rails` setup already picks+ # up via `FactoryBot.find_definitions`. Spree's own factories live+ # under lib/spree/testing_support/factories/ because that path is+ # exported by gems; downstream apps don't have that loader by default.+ template 'factory.rb.tt', "spec/factories/spree/#{singular_name}_factory.rb"enddef create_controller_specsdiff --git a/spree/core/spec/lib/generators/spree/api_resource/api_resource_generator_spec.rb b/spree/core/spec/lib/generators/spree/api_resource/api_resource_generator_spec.rbindex b41672642b..d753bc9fb8 100644--- a/spree/core/spec/lib/generators/spree/api_resource/api_resource_generator_spec.rb+++ b/spree/core/spec/lib/generators/spree/api_resource/api_resource_generator_spec.rb@@ -25,7 +25,7 @@ RSpec.describe Spree::ApiResourceGenerator, type: :generator doadmin_controller: read_at(File.join(destination, 'app/controllers/spree/api/v3/admin')),store_serializer: read_first(File.join(destination, 'app/serializers/spree/api/v3/*_serializer.rb')),admin_serializer: read_first(File.join(destination, 'app/serializers/spree/api/v3/admin/*_serializer.rb')),- factory: read_first(File.join(destination, 'lib/spree/testing_support/factories/*_factory.rb'))+ factory: read_first(File.join(destination, 'spec/factories/spree/*_factory.rb'))}end@@ -115,10 +115,12 @@ RSpec.describe Spree::ApiResourceGenerator, type: :generator doenddescribe 'factory + serializers' do- it 'generates a factory file under lib/spree/testing_support/factories/' do+ it 'generates a factory file under spec/factories/spree/ so FactoryBot.find_definitions picks it up' doresult = run_generator(['Brand', 'name:string'])expect(result[:factory]).to include('factory :brand, class: Spree::Brand')+ expect(Dir[File.join(destination, 'spec/factories/spree/*_factory.rb')]).not_to be_empty+ expect(Dir[File.join(destination, 'lib/spree/testing_support/factories/*_factory.rb')]).to be_emptyendit 'generates Store and Admin serializers (Admin inherits Store)' do