spree_core 5.3.2 → 5.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8852343e0b0e126beaff8b5745ca76527a0c436344f670c2cdab2f27eeb1f23f
-  data.tar.gz: a3378bc532a952c8d72190c5ebfb244c07b103a8f4bb67ec3bcf889278395a45
+  metadata.gz: 2b1ea480e8607e801d3c45d8decf522c829003eb3fa6c1f8f92b9185a4bfefec
+  data.tar.gz: 552fb0686b6da4a560dd47144d52079d1ab73c270a9e4c9093e62b9e556ef74f
 SHA512:
-  metadata.gz: 893e2c5b7d12b76c599a35ed91df5062fb8849144c4dd34cfc528b59c7c8d993ef523e443d3aba36e949af5814f68105af80fc3caee9295919d53eb5fe3ed137
-  data.tar.gz: 81cdf22db519e0695e36363a097a0b6703e4bba5a44aff5989bb225d5ea2f16e1ffa087507c2af57254bdd1c3fd0b24b5649b56bca0ee8b38bc46bee59172041
+  metadata.gz: 1ed2cab50fb7c122df6565b931324ea7ba307c8580a98ac8f9e2e400140df75092ed417db47311a6d3ec01985a6696cfbce1d3e3fa7917c329646b13ef51b095
+  data.tar.gz: 34bd9929ed9e4a962696b2be41a5bb0da2c330fd12d1cbff89e34fa78cdceaa84d6b58cb7ae321d1868864c2888eccd752cd0bef7dbd9cd473aa68490619c2f6

data/app/models/spree/invitation.rb

@@ -54,7 +54,7 @@ module Spree
     #
     after_initialize :set_defaults, if: :new_record?
     before_validation :set_invitee_from_email, on: :create
-    after_create :publish_invitation_created_event, unless: :skip_email
+    after_commit :publish_invitation_created_event, on: :create, unless: :skip_email
 
     # returns the store for the invitation
     # if the resource is a store, return the resource

data/app/models/spree/product/slugs.rb

@@ -103,7 +103,7 @@ module Spree
         translations.with_deleted.each { |rec| rec.update_columns(slug: new_slug.call(rec)) }
         slugs.with_deleted.each { |rec| rec.update_column(:slug, new_slug.call(rec)) }
 
-        translations.find_by!(locale: I18n.locale).update_column(:slug, slug) if Spree.use_translations?
+        translations.find_by(locale: I18n.locale)&.update_column(:slug, slug) if Spree.use_translations?
       end
     end
   end

data/app/models/spree/store_product.rb

@@ -9,6 +9,8 @@ module Spree
     validates :store_id, uniqueness: { scope: :product_id }
 
     def refresh_metrics!
+      return if product.nil?
+
       completed_order_ids = product.completed_orders.where(store_id: store_id).select(:id)
       variant_ids = product.variants_including_master.ids
 

data/app/models/spree/variant.rb

@@ -91,36 +91,33 @@ module Spree
     scope :backorderable, -> { left_joins(:stock_items).where(spree_stock_items: { backorderable: true }) }
     scope :in_stock_or_backorderable, -> { in_stock.or(backorderable) }
 
-    scope :eligible, -> {
-      where(is_master: false).or(
-        where(
-          product_id: Spree::Variant.
-                      select(:product_id).
-                      group(:product_id).
-                      having("COUNT(#{Spree::Variant.table_name}.id) = 1")
+    scope :eligible, lambda {
+      joins(:product).where(
+        arel_table[:is_master].eq(false).or(
+          Spree::Product.arel_table[:variant_count].eq(0)
         )
       )
     }
 
-    scope :not_discontinued, -> do
+    scope :not_discontinued, lambda {
       where(
         arel_table[:discontinue_on].eq(nil).or(
           arel_table[:discontinue_on].gteq(Time.current)
         )
       )
-    end
+    }
 
     scope :not_deleted, -> { where("#{Spree::Variant.quoted_table_name}.deleted_at IS NULL") }
 
-    scope :for_currency_and_available_price_amount, ->(currency = nil) do
+    scope :for_currency_and_available_price_amount, lambda { |currency = nil|
       currency ||= Spree::Store.default.default_currency
       joins(:prices).where("#{Spree::Price.table_name}.currency = ?", currency).where("#{Spree::Price.table_name}.amount IS NOT NULL").distinct
-    end
+    }
 
-    scope :active, ->(currency = nil) do
+    scope :active, lambda { |currency = nil|
       not_discontinued.not_deleted.
         for_currency_and_available_price_amount(currency)
-    end
+    }
 
     scope :with_option_value, lambda { |option_name, option_value|
       option_type_ids = OptionType.where(name: option_name).ids
@@ -187,7 +184,8 @@ module Spree
     )
 
     self.whitelisted_ransackable_associations = %w[option_values product tax_category prices default_price]
-    self.whitelisted_ransackable_attributes = %w[weight depth width height sku discontinue_on is_master cost_price cost_currency track_inventory deleted_at]
+    self.whitelisted_ransackable_attributes = %w[weight depth width height sku discontinue_on is_master cost_price cost_currency track_inventory
+                                                 deleted_at]
     self.whitelisted_ransackable_scopes = %i(product_name_or_sku_cont search_by_product_name_or_sku)
 
     def self.product_name_or_sku_cont(query)
@@ -258,9 +256,13 @@ module Spree
     # @return [String] the options text of the variant
     def options_text
       @options_text ||= if option_values.loaded?
-                          option_values.sort_by { |ov| ov.option_type.position }.map { |ov| "#{ov.option_type.presentation}: #{ov.presentation}" }.to_sentence(words_connector: ', ', two_words_connector: ', ')
+                          option_values.sort_by do |ov|
+                            ov.option_type.position
+                          end.map { |ov| "#{ov.option_type.presentation}: #{ov.presentation}" }.to_sentence(words_connector: ', ', two_words_connector: ', ')
                         else
-                          option_values.includes(:option_type).joins(:option_type).order("#{Spree::OptionType.table_name}.position").map { |ov| "#{ov.option_type.presentation}: #{ov.presentation}" }.to_sentence(words_connector: ', ', two_words_connector: ', ')
+                          option_values.includes(:option_type).joins(:option_type).order("#{Spree::OptionType.table_name}.position").map do |ov|
+                            "#{ov.option_type.presentation}: #{ov.presentation}"
+                          end.to_sentence(words_connector: ', ', two_words_connector: ', ')
                         end
     end
 
@@ -273,7 +275,7 @@ module Spree
     # Returns the descriptive name of the variant.
     # @return [String] the descriptive name of the variant
     def descriptive_name
-      is_master? ? name + ' - Master' : name + ' - ' + options_text
+      is_master? ? "#{name} - Master" : "#{name} - #{options_text}"
     end
 
     # use deleted? rather than checking the attribute directly. this

data/app/services/spree/data_feeds/google/rss.rb

@@ -18,7 +18,9 @@ module Spree
                 result = products_list.call(store)
                 if result.success?
                   result.value[:products].find_each do |product|
-                    product.variants.active.find_each do |variant|
+                    product.variants_including_master.active.find_each do |variant|
+                      next if variant.is_master? && product.has_variants?
+
                       add_variant_information_to_xml(xml, product, variant)
                     end
                   end

data/app/views/spree/addresses/_form.html.erb

@@ -45,8 +45,7 @@
       </div>
       <%= render "spree/addresses/suggestions_box" %>
     </div>
-    <span class="text-sm space-x-2 items-center hidden alert alert-info mt-2 align-items-center" data-address-autocomplete-target="addressWarning">
-      <%= heroicon "exclamation-circle", variant: :outline if defined?(heroicon) %>
+    <span class="text-sm space-x-2 hidden alert alert-info mt-2 static" data-address-autocomplete-target="addressWarning">
       <%= Spree.t('address_book.add_house_number') %>
     </span>
   </div>

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -14,7 +14,7 @@ development:
   database: db/spree_development.sqlite3
 test:
   adapter: sqlite3
-  database: db/spree_test.sqlite3
+  database: db/spree_test<%%= ENV['TEST_ENV_NUMBER'] %>.sqlite3
   timeout: 10000
 production:
   adapter: sqlite3
@@ -40,7 +40,7 @@ development:
   database: <%= database_prefix %><%= lib_name %>_spree_development
 test:
   <<: *mysql
-  database: <%= database_prefix %><%= lib_name %>_spree_test
+  database: <%= database_prefix %><%= lib_name %>_spree_test<%%= ENV['TEST_ENV_NUMBER'] %>
 production:
   <<: *mysql
   database: <%= database_prefix %><%= lib_name %>_spree_production
@@ -57,14 +57,14 @@ postgres: &postgres
   host: <%= db_host %>
   <% end %>
   min_messages: warning
-  pool: <%= ENV["DB_POOL"] || 50 %>
+  pool: <%%= ENV.fetch("DB_POOL", 50) %>
 
 development:
   <<: *postgres
   database: <%= database_prefix %><%= lib_name %>_spree_development
 test:
   <<: *postgres
-  database: <%= database_prefix %><%= lib_name %>_spree_test
+  database: <%= database_prefix %><%= lib_name %>_spree_test<%%= ENV['TEST_ENV_NUMBER'] %>
 production:
   <<: *postgres
   database: <%= database_prefix %><%= lib_name %>_spree_production
@@ -74,8 +74,8 @@ development:
   database: db/spree_development.sqlite3
 test:
   adapter: sqlite3
-  database: db/spree_test.sqlite3
+  database: db/spree_test<%%= ENV['TEST_ENV_NUMBER'] %>.sqlite3
 production:
   adapter: sqlite3
   database: db/spree_production.sqlite3
-<% end %>
+<% end %>

data/lib/spree/core/controller_helpers/auth.rb

@@ -21,6 +21,8 @@ module Spree
         end
 
         def current_oauth_token
+          Spree::Deprecation.warn('Spree::Current.oauth_token is deprecated and will be removed in Spree 5.5')
+
           get_last_access_token = ->(user) { Spree::OauthAccessToken.active_for(user).where(expires_in: nil).last }
           create_access_token = ->(user) { Spree::OauthAccessToken.create!(resource_owner: user) }
           user = try_spree_current_user

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.3.2'.freeze
+  VERSION = '5.3.4'.freeze
 
   def self.version
     VERSION

data/lib/spree/testing_support/common_rake.rb

@@ -134,3 +134,56 @@ namespace :common do
     system('bundle exec rake db:seed RAILS_ENV=test > /dev/null 2>&1')
   end
 end
+
+# Custom parallel setup task instead of parallel_tests' native parallel:create/parallel:prepare
+# because Spree gems are not Rails apps — the Rails app lives in spec/dummy/ and db: rake tasks
+# are not available from the gem directory. For SQLite, we copy the primary .sqlite3 file which
+# is faster than creating + migrating N databases through Rails.
+desc 'Create and prepare databases for parallel test workers'
+task :parallel_setup, [:count] do |_t, args|
+  require 'parallel'
+
+  count = (args[:count] || ENV.fetch('PARALLEL_TEST_PROCESSORS', Parallel.processor_count)).to_i
+  dummy_path = ENV['DUMMY_PATH'] || 'spec/dummy'
+  db_config_path = File.join(dummy_path, 'config', 'database.yml')
+
+  raise "Database config not found at #{db_config_path}. Run 'rake test_app' first." unless File.exist?(db_config_path)
+
+  require 'erb'
+  require 'yaml'
+
+  db_config = YAML.safe_load(ERB.new(File.read(db_config_path)).result, permitted_classes: [Symbol])
+  adapter = db_config.dig('test', 'adapter')
+
+  if adapter == 'sqlite3'
+    # For SQLite, copy the primary test database for each worker
+    primary_db = File.join(dummy_path, db_config.dig('test', 'database'))
+
+    raise "Primary test database not found at #{primary_db}. Run 'rake test_app' first." unless File.exist?(primary_db)
+
+    2.upto(count) do |i|
+      worker_db = primary_db.sub(/\.sqlite3$/, "#{i}.sqlite3")
+      FileUtils.cp(primary_db, worker_db)
+      puts "Created parallel database: #{worker_db}"
+    end
+  else
+    # For PostgreSQL/MySQL, create and migrate each worker's database
+    2.upto(count) do |i|
+      env_vars = "TEST_ENV_NUMBER=#{i} RAILS_ENV=test"
+      puts "Setting up database for worker #{i}..."
+      Dir.chdir(dummy_path) do
+        system("#{env_vars} bundle exec rake db:create db:migrate") || raise("Failed to setup database for worker #{i}")
+      end
+    end
+  end
+
+  puts "Parallel databases setup complete (#{count} workers)"
+end
+
+desc 'Run specs in parallel'
+task :parallel_spec, [:count] do |_t, args|
+  count = args[:count] || ENV.fetch('PARALLEL_TEST_PROCESSORS', nil)
+  count_arg = count ? "-n #{count}" : ''
+  success = system("bundle exec parallel_rspec #{count_arg} spec")
+  exit(success ? 0 : 1)
+end

data/lib/spree/testing_support/factories/calculator_factory.rb

@@ -1,10 +1,10 @@
 FactoryBot.define do
   factory :calculator, class: Spree::Calculator::FlatRate do
-    after(:create) { |c| c.set_preference(:amount, 10.0) }
+    preferred_amount { 10.0 }
   end
 
   factory :no_amount_calculator, class: Spree::Calculator::FlatRate do
-    after(:create) { |c| c.set_preference(:amount, 0) }
+    preferred_amount { 0 }
   end
 
   factory :default_tax_calculator, class: Spree::Calculator::DefaultTax do
@@ -27,10 +27,10 @@ FactoryBot.define do
   end
 
   factory :non_free_shipping_calculator, class: Spree::Calculator::Shipping::FlatRate do
-    after(:create) { |c| c.set_preference(:amount, 20.0) }
+    preferred_amount { 20.0 }
   end
 
   factory :digital_shipping_calculator, class: Spree::Calculator::Shipping::DigitalDelivery do
-    after(:create) { |c| c.set_preference(:amount, 0) }
+    preferred_amount { 0 }
   end
 end

data/lib/spree/testing_support/factories/custom_domain_factory.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :custom_domain, class: Spree::CustomDomain do
     url { FFaker::Internet.domain_name }
-    store { create(:store) }
+    association :store, factory: :store
     default { true }
   end
 end

data/lib/spree/testing_support/factories/customer_group_user_factory.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :customer_group_user, class: Spree::CustomerGroupUser do
     customer_group
-    user { create(:user) }
+    user
   end
 end

data/lib/spree/testing_support/factories/export_factory.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :export, class: 'Spree::Export' do
-    store { create(:store) }
-    user { create(:admin_user) }
+    association :store, factory: :store
+    association :user, factory: :admin_user
     type { 'Spree::Exports::Products' }
     format { 'csv' }
 

data/lib/spree/testing_support/factories/google_data_feed_factory.rb

@@ -1,8 +1,7 @@
 FactoryBot.define do
   factory :google_data_feed, class: Spree::DataFeed::Google do
-    id             { 1 }
     active         { true }
-    store          { create(:store) }
+    association :store, factory: :store
     name           { 'test' }
   end
 end

data/lib/spree/testing_support/factories/import_factory.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :import, class: 'Spree::Import' do
     owner { Spree::Store.default || create(:store) }
-    user { create(:admin_user) }
+    association :user, factory: :admin_user
     type { 'Spree::Imports::Products' }
 
     factory :product_import, class: 'Spree::Imports::Products', parent: :import do

data/lib/spree/testing_support/factories/invitation_factory.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :invitation, class: Spree::Invitation do
     email { FFaker::Internet.email }
-    inviter { create(:admin_user) }
+    association :inviter, factory: :admin_user
   end
 end

data/lib/spree/testing_support/factories/line_item_factory.rb

@@ -4,13 +4,18 @@ FactoryBot.define do
     quantity { 1 }
     price    { BigDecimal('10.00') }
     currency { order.currency }
-    product do
-      if order&.store&.present?
-        create(:product, stores: [order.store])
-      else
-        create(:product)
+    transient do
+      product { nil }
+    end
+    variant do
+      resolved_product = product || begin
+        if order&.store&.present?
+          create(:product, stores: [order.store])
+        else
+          create(:product)
+        end
       end
+      resolved_product.master
     end
-    variant { product.master }
   end
 end

data/lib/spree/testing_support/factories/order_factory.rb

@@ -13,10 +13,11 @@ FactoryBot.define do
 
     before(:create) do |order|
       unless order.store.present?
-        default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
-        store = default_store || create(:store)
-
-        order.store = store
+        store = begin
+          default = Spree::Store.default
+          default&.persisted? ? default : nil
+        end
+        order.store = store || create(:store)
       end
     end
 
@@ -42,7 +43,6 @@ FactoryBot.define do
     end
 
     factory :order_with_line_items do
-      bill_address
       ship_address
 
       transient do

data/lib/spree/testing_support/factories/payment_factory.rb

@@ -23,7 +23,7 @@ FactoryBot.define do
 
   factory :check_payment, class: Spree::Payment do
     amount { 45.75 }
-    order  { create(:order, total: 45.75) }
+    order  { create(:order, total: amount) }
 
     association(:payment_method, factory: :check_payment_method)
   end

data/lib/spree/testing_support/factories/post_factory.rb

@@ -1,11 +1,11 @@
 FactoryBot.define do
   factory :post, class: Spree::Post do
-    post_category { create(:post_category, store: Spree::Store.default || create(:store)) }
+    store { Spree::Store.default || create(:store) }
+    post_category { association(:post_category, store: store) }
     title { FFaker::Lorem.sentence }
     content { FFaker::Lorem.paragraph }
     published_at { Time.current }
-    author { create(:admin_user) }
-    store { Spree::Store.default || create(:store) }
+    association :author, factory: :admin_user
 
     trait :with_image do
       image { Rack::Test::UploadedFile.new(Spree::Core::Engine.root.join('spec/fixtures/thinking-cat.jpg'), 'image/jpeg') }

data/lib/spree/testing_support/factories/product_factory.rb

@@ -19,7 +19,10 @@ FactoryBot.define do
       create(:store, default: true) unless Spree::Store.any?
     end
     after(:create) do |product|
-      Spree::StockLocation.all.each { |stock_location| stock_location.propagate_variant(product.master) unless stock_location.stock_items.exists?(variant: product.master) }
+      existing_location_ids = product.master.stock_items.pluck(:stock_location_id)
+      Spree::StockLocation.where.not(id: existing_location_ids).find_each do |stock_location|
+        stock_location.propagate_variant(product.master)
+      end
     end
 
     factory :custom_product do
@@ -49,8 +52,8 @@ FactoryBot.define do
       end
       factory :product_with_properties do
         after(:create) do |product|
-          create(:property, :brand, id: 10)
-          create(:product_property, product: product, property_id: 10, value: 'Epsilon')
+          property = create(:property, :brand)
+          create(:product_property, product: product, property: property, value: 'Epsilon')
         end
       end
 

data/lib/spree/testing_support/factories/product_property_factory.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :product_property, class: Spree::ProductProperty do
-    product { create(:product, stores: [Spree::Store.default]) }
+    product
     value { "val-#{rand(50)}" }
     property
   end

data/lib/spree/testing_support/factories/prototype_factory.rb

@@ -1,11 +1,11 @@
 FactoryBot.define do
   factory :prototype, class: Spree::Prototype do
     name       { 'Baseball Cap' }
-    properties { [create(:property)] }
+    properties { [build(:property)] }
   end
   factory :prototype_with_option_types, class: Spree::Prototype do
     name         { 'Baseball Cap' }
-    properties   { [create(:property)] }
-    option_types { [create(:option_type)] }
+    properties   { [build(:property)] }
+    option_types { [build(:option_type)] }
   end
 end

data/lib/spree/testing_support/factories/report_factory.rb

@@ -14,8 +14,8 @@
 #
 FactoryBot.define do
   factory :report, class: 'Spree::Reports::SalesTotal' do
-    store { create(:store) }
-    user { create(:admin_user) }
+    association :store, factory: :store
+    association :user, factory: :admin_user
     type { 'Spree::Reports::SalesTotal' }
     currency { 'USD' }
     date_from { 1.month.ago }
@@ -23,8 +23,8 @@ FactoryBot.define do
   end
 
   factory :products_performance_report, class: 'Spree::Reports::ProductsPerformance' do
-    store { create(:store) }
-    user { create(:admin_user) }
+    association :store, factory: :store
+    association :user, factory: :admin_user
     type { 'Spree::Reports::ProductsPerformance' }
     currency { 'USD' }
     date_from { 1.month.ago }

data/lib/spree/testing_support/factories/store_credit_event_factory.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :store_credit_auth_event, class: Spree::StoreCreditEvent do
-    store_credit       { create(:store_credit) }
+    association :store_credit, factory: :store_credit
     action             { Spree::StoreCredit::AUTHORIZE_ACTION }
     amount             { 100.00 }
     authorization_code { "#{store_credit.id}-SC-20140602164814476128" }

data/lib/spree/testing_support/factories/store_credit_factory.rb

@@ -3,11 +3,11 @@ FactoryBot.define do
 
   factory :store_credit, class: Spree::StoreCredit do
     user
-    created_by { create(:admin_user) }
-    category { create(:store_credit_category) }
+    association :created_by, factory: :admin_user
+    association :category, factory: :store_credit_category
     amount { 150.00 }
     currency { 'USD' }
-    credit_type { create(:primary_credit_type) }
+    association :credit_type, factory: :primary_credit_type
     store { Spree::Store.default || create(:store) }
   end
 

data/lib/spree/testing_support/factories/user_factory.rb

@@ -13,11 +13,9 @@ FactoryBot.define do
 
     factory :user_with_addresses, aliases: [:user_with_addreses] do
       after(:create) do |user|
-        user.ship_address = create(:address, user: user)
-        user.bill_address = create(:address, user: user)
-        user.addresses << user.ship_address
-        user.addresses << user.bill_address
-        user.save
+        ship_address = create(:address, user: user)
+        bill_address = create(:address, user: user)
+        user.update_columns(ship_address_id: ship_address.id, bill_address_id: bill_address.id)
       end
     end
   end

data/lib/spree/testing_support/factories/variant_factory.rb

@@ -13,7 +13,7 @@ FactoryBot.define do
     track_inventory { true }
 
     product       { |p| p.association(:base_product, stores: [Spree::Store.default]) }
-    option_values { [create(:option_value)] }
+    option_values { [build(:option_value)] }
 
     transient do
       create_stock { true }
@@ -26,9 +26,8 @@ FactoryBot.define do
 
     after(:create) do |variant, evaluator|
       if evaluator.create_stock
-        Spree::StockLocation.all.each do |stock_location|
-          next if stock_location.stock_item(variant).present?
-
+        existing_location_ids = variant.stock_items.pluck(:stock_location_id)
+        Spree::StockLocation.where.not(id: existing_location_ids).find_each do |stock_location|
           stock_location.propagate_variant(variant)
         end
       end

data/lib/spree/testing_support/factories/zone_factory.rb

@@ -13,13 +13,16 @@ FactoryBot.define do
       end
 
       factory :global_zone, class: Spree::Zone do
-        sequence(:name) { |n| "GlobalZone_#{n}" }
+        name { 'GlobalZone' }
 
-        zone_members do |proxy|
-          zone = proxy.instance_eval { @instance }
+        after(:create) do |zone|
+          country_ids = Spree::Country.pluck(:id)
+          existing_ids = zone.zone_members.where(zoneable_type: 'Spree::Country').pluck(:zoneable_id)
+          new_ids = country_ids - existing_ids
 
-          Spree::Country.all.map do |country|
-            Spree::ZoneMember.where(zoneable: country, zone: zone).first_or_create
+          if new_ids.any?
+            records = new_ids.map { |id| { zoneable_type: 'Spree::Country', zoneable_id: id, zone_id: zone.id, created_at: Time.current, updated_at: Time.current } }
+            Spree::ZoneMember.insert_all(records)
           end
         end
       end

data/lib/spree/testing_support/factories.rb

@@ -2,7 +2,7 @@ require 'factory_bot'
 
 Spree::Zone.class_eval do
   def self.global
-    find_by(name: 'GlobalZone') || FactoryBot.create(:global_zone)
+    find_by(name: 'GlobalZone') || FactoryBot.create(:global_zone, name: 'GlobalZone')
   end
 end
 

data/lib/spree/testing_support/store.rb

@@ -34,10 +34,6 @@ RSpec.configure do |config|
   end
 
   config.after(:all) do
-    unless self.class.metadata[:without_global_store]
-      DatabaseCleaner.strategy = :transaction
-      DatabaseCleaner.clean_with(:truncation)
-      clear_enqueued_jobs
-    end
+    clear_enqueued_jobs
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.3.2
+  version: 5.3.4
 platform: ruby
 authors:
 - Sean Schofield
@@ -1717,9 +1717,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.3.2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.3.4
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.3.2
+  source_code_uri: https://github.com/spree/spree/tree/v5.3.4
 rdoc_options: []
 require_paths:
 - lib