spree_core 5.3.5 → 5.4.0.beta

data/lib/spree/permitted_attributes.rb

@@ -2,6 +2,7 @@ module Spree
   module PermittedAttributes
     ATTRIBUTES = [
       :address_attributes,
+      :api_key_attributes,
       :asset_attributes,
       :checkout_attributes,
       :classification_attributes,
@@ -22,6 +23,7 @@ module Spree
       :inventory_unit_attributes,
       :invitation_attributes,
       :line_item_attributes,
+      :market_attributes,
       :menu_attributes,
       :menu_item_attributes,
       :metafield_attributes,
@@ -34,6 +36,8 @@ module Spree
       :page_section_attributes,
       :payment_attributes,
       :payment_method_attributes,
+      :payment_session_attributes,
+      :payment_setup_session_attributes,
       :policy_attributes,
       :post_attributes,
       :post_category_attributes,
@@ -80,13 +84,15 @@ module Spree
 
     @@address_attributes = [
       :id, :firstname, :lastname, :first_name, :last_name,
-      :address1, :address2, :city, :country_iso, :country_id, :state_id,
+      :address1, :address2, :city, :country_iso, :state_abbr, :country_id, :state_id,
       :zipcode, :phone, :state_name, :alternative_phone, :company,
       :user_id, :deleted_at, :label, :quick_checkout,
       { country: [:iso, :name, :iso3, :iso_name],
         state: [:name, :abbr] }
     ]
 
+    @@api_key_attributes = [:name, :key_type]
+
     @@asset_attributes = [:type, :viewable_id, :viewable_type, :attachment, :alt, :position]
 
     @@checkout_attributes = [
@@ -136,6 +142,9 @@ module Spree
 
     @@line_item_attributes = [:id, :variant_id, :quantity]
 
+    @@market_attributes = [:name, :currency, :default_locale, :supported_locales,
+                           :tax_inclusive, :default, :position, country_ids: []]
+
     @@menu_attributes = [:name, :locale, :location]
 
     @@menu_item_attributes = [:name, :subtitle, :destination, :new_window, :item_type,
@@ -162,6 +171,10 @@ module Spree
 
     @@payment_method_attributes = [:name, :type, :description, :active, :display_on, :auto_capture, :position]
 
+    @@payment_session_attributes = [:amount, :payment_method_id, { external_data: {} }]
+
+    @@payment_setup_session_attributes = [:payment_method_id, { external_data: {} }]
+
     @@policy_attributes = [:name, :slug, :body]
 
     @@post_attributes = [:title, :meta_title, :meta_description, :slug, :author_id, :post_category_id, :published_at, :content, :excerpt, :image, tag_list: []]
@@ -262,19 +275,18 @@ module Spree
                                    stock_movements_attributes: [:variant_id, :quantity, :originator_id, :stock_item_id]]
 
     @@store_attributes = [:name, :url, :seo_title, :code, :meta_keywords,
-                          :meta_description, :default_currency, :mail_from_address,
+                          :meta_description, :default_currency, :default_country_iso, :mail_from_address,
                           :customer_support_email, :description, :address, :contact_phone,
-                          :supported_locales, :default_locale, :default_country_id, :supported_currencies,
-                          :new_order_notifications_email, :checkout_zone_id, :seo_robots,
-                          :preferred_timezone, :preferred_weight_unit, :preferred_unit_system,
+                          :supported_locales, :default_locale, :supported_currencies,
+                          :new_order_notifications_email, :seo_robots,
+                          :preferred_admin_locale, :preferred_timezone, :preferred_weight_unit, :preferred_unit_system,
                           :preferred_digital_asset_authorized_clicks, :preferred_digital_asset_authorized_days,
                           :preferred_limit_digital_download_count, :preferred_limit_digital_download_days,
                           :preferred_digital_asset_link_expire_time,
                           :logo, :mailer_logo, :social_logo, :favicon_image,
-                          :import_products_from_store_id, :import_payment_methods_from_store_id,
                           :checkout_message, :preferred_guest_checkout,
                           :customer_terms_of_service, :customer_privacy_policy,
-                          :customer_returns_policy, :customer_shipping_policy, :default_country_iso]
+                          :customer_returns_policy, :customer_shipping_policy]
 
     @@store_credit_attributes = %i[amount currency category_id memo]
 

data/lib/spree/testing_support/capybara_config.rb

@@ -1,7 +1,7 @@
 require 'capybara-screenshot/rspec'
 
 Capybara.configure do |config|
-  config.save_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
+  config.save_path = ENV['CI_ARTIFACTS'] if ENV['CI_ARTIFACTS']
   config.server = :puma
   config.default_driver = :rack_test
   config.javascript_driver = :selenium_chrome_headless
@@ -27,7 +27,7 @@ Capybara.register_driver :selenium_chrome_headless do |app|
   options.add_argument '--window-size=1920,1080'
   options.add_argument '--disable-search-engine-choice-screen'
 
-  # Required for running in Docker containers (CircleCI)
+  # Required for running in CI containers
   options.add_argument '--no-sandbox'
   options.add_argument '--disable-dev-shm-usage'
 

data/lib/spree/testing_support/common_rake.rb

@@ -4,14 +4,25 @@ require 'generators/spree/dummy_model/dummy_model_generator'
 desc 'Generates a dummy app for testing'
 namespace :common do
   task :test_app, [:authentication, :user_class, :admin_user_class, :css, :javascript, :install_admin, :install_storefront] do |_t, args|
-    args.with_defaults(
+    # Support both Rake::TaskArguments (via invoke) and Hash (via execute)
+    # When using execute with a Hash, args IS the hash directly
+    defaults = {
       authentication: 'dummy',
       user_class: 'Spree::LegacyUser',
+      admin_user_class: 'Spree::LegacyAdminUser',
       install_storefront: false,
       install_admin: false,
       javascript: false,
       css: false
-    )
+    }
+    # Rake::TaskArguments#with_defaults modifies in-place
+    # ActiveSupport adds Hash#with_defaults which returns a new hash, so check for Rake::TaskArguments specifically
+    if args.is_a?(Rake::TaskArguments)
+      args.with_defaults(defaults)
+    else
+      # Hash passed via execute - use reverse_merge! to merge defaults in place
+      args.reverse_merge!(defaults)
+    end
     require ENV['LIB_NAME'].to_s
 
     # Convert to booleans (supports both string and boolean values for backwards compatibility)
@@ -60,8 +71,8 @@ namespace :common do
     core_gems = %w[spree/core spree/api]
     root_gemfile = File.expand_path('../../../../Gemfile', __dir__)
     use_root_gemfile = core_gems.include?(ENV['LIB_NAME']) &&
-                       File.exist?(root_gemfile) &&
-                       File.exist?(File.expand_path('../../../../spree.gemspec', __dir__))
+      File.exist?(root_gemfile) &&
+      File.exist?(File.expand_path('../../../../spree.gemspec', __dir__))
     bundle_exec = use_root_gemfile ? "bundle exec --gemfile=#{root_gemfile}" : 'bundle exec'
     puts 'Running Spree install generator...'
     system("#{bundle_exec} rails g spree:install --force --auto-accept --migrate=false --seed=false --sample=false --user_class=#{args[:user_class]} --admin_user_class=#{args[:admin_user_class]} --authentication=#{args[:authentication]}")

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

@@ -0,0 +1,19 @@
+FactoryBot.define do
+  factory :api_key, class: Spree::ApiKey do
+    name { FFaker::Lorem.word }
+    key_type { 'publishable' }
+    store
+
+    trait :publishable do
+      key_type { 'publishable' }
+    end
+
+    trait :secret do
+      key_type { 'secret' }
+    end
+
+    trait :revoked do
+      revoked_at { Time.current }
+    end
+  end
+end

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

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

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

@@ -16,5 +16,17 @@ FactoryBot.define do
         )
       end
     end
+
+    factory :customer_import, class: 'Spree::Imports::Customers', parent: :import do
+      type { 'Spree::Imports::Customers' }
+
+      after(:create) do |import|
+        import.attachment.attach(
+          io: File.open(Spree::Core::Engine.root.join('spec', 'fixtures', 'files', 'customers_import.csv')),
+          filename: 'customers_import.csv',
+          content_type: 'text/csv'
+        )
+      end
+    end
   end
 end

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

@@ -0,0 +1,35 @@
+FactoryBot.define do
+  factory :market, class: Spree::Market do
+    sequence(:name) { |n| "Market #{n}" }
+    currency { 'USD' }
+    default_locale { 'en' }
+    store
+    countries { [association(:country)] }
+
+    after(:build) do |market|
+      if market.countries.any?
+        zone = Spree::Zone.find_or_create_by!(name: 'Test Shipping Zone') do |z|
+          z.kind = 'country'
+        end
+        market.countries.each do |country|
+          zone.zone_members.find_or_create_by!(zoneable: country)
+        end
+        if zone.shipping_methods.empty?
+          shipping_category = Spree::ShippingCategory.first || FactoryBot.create(:shipping_category)
+          FactoryBot.create(:shipping_method, zones: [zone], shipping_categories: [shipping_category])
+        end
+      end
+    end
+
+    trait :default do
+      default { true }
+    end
+
+    trait :eu do
+      name { 'Europe' }
+      currency { 'EUR' }
+      default_locale { 'de' }
+      tax_inclusive { true }
+    end
+  end
+end

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

@@ -75,8 +75,10 @@ FactoryBot.define do
         state { 'complete' }
 
         after(:create) do |order, evaluator|
-          order.refresh_shipment_rates(evaluator.shipping_method_filter)
+          # Set completed_at before refreshing shipment rates so order.completed? returns true
+          # This prevents the shipping rate selection from recalculating order totals
           order.update_column(:completed_at, order.completed_at || Time.current)
+          order.refresh_shipment_rates(evaluator.shipping_method_filter)
         end
 
         factory :completed_order_with_pending_payment do

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

@@ -42,4 +42,6 @@ FactoryBot.define do
     type { 'Spree::Gateway::CustomPaymentSourceMethod' }
     name { 'Custom' }
   end
+
+  factory :bogus_payment_method, parent: :credit_card_payment_method
 end

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

@@ -0,0 +1,47 @@
+FactoryBot.define do
+  factory :payment_session, class: 'Spree::PaymentSession' do
+    order
+    payment_method { create(:credit_card_payment_method, stores: [order.store]) }
+    amount { order.total }
+    currency { order.currency }
+    status { 'pending' }
+    external_id { "ps_test_#{SecureRandom.hex(12)}" }
+    external_data { {} }
+
+    trait :processing do
+      status { 'processing' }
+    end
+
+    trait :completed do
+      status { 'completed' }
+    end
+
+    trait :failed do
+      status { 'failed' }
+    end
+
+    trait :canceled do
+      status { 'canceled' }
+    end
+
+    trait :expired do
+      status { 'expired' }
+      expires_at { 1.hour.ago }
+    end
+
+    trait :with_expiration do
+      expires_at { 24.hours.from_now }
+    end
+
+    trait :with_customer do
+      customer { order.user || create(:user) }
+    end
+
+    factory :bogus_payment_session, class: 'Spree::PaymentSessions::Bogus' do
+      type { 'Spree::PaymentSessions::Bogus' }
+      payment_method { create(:bogus_payment_method, stores: [order.store]) }
+      external_id { "bogus_#{SecureRandom.hex(12)}" }
+      external_data { { 'client_secret' => "bogus_secret_#{SecureRandom.hex(8)}" } }
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+FactoryBot.define do
+  factory :payment_setup_session, class: 'Spree::PaymentSetupSession' do
+    customer { create(:user) }
+    payment_method { create(:credit_card_payment_method) }
+    status { 'pending' }
+    external_id { "seti_test_#{SecureRandom.hex(12)}" }
+    external_client_secret { "seti_secret_#{SecureRandom.hex(12)}" }
+    external_data { {} }
+
+    trait :processing do
+      status { 'processing' }
+    end
+
+    trait :completed do
+      status { 'completed' }
+      payment_source { create(:credit_card, user: customer) }
+    end
+
+    trait :failed do
+      status { 'failed' }
+    end
+
+    trait :canceled do
+      status { 'canceled' }
+    end
+
+    trait :expired do
+      status { 'expired' }
+    end
+  end
+end

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

@@ -45,5 +45,15 @@ FactoryBot.define do
         customer_group_ids { [] }
       end
     end
+
+    factory :market_price_rule, class: Spree::PriceRules::MarketRule do
+      after(:build) do |rule, evaluator|
+        rule.preferred_market_ids = evaluator.market_ids if evaluator.respond_to?(:market_ids)
+      end
+
+      transient do
+        market_ids { [] }
+      end
+    end
   end
 end

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

@@ -0,0 +1,15 @@
+FactoryBot.define do
+  factory :user_identity, class: Spree::UserIdentity do
+    association(:user, factory: :user)
+    provider { 'email' }
+    sequence(:uid) { |n| "user_#{n}" }
+    info { { email: user.email } }
+    access_token { nil }
+    refresh_token { nil }
+    expires_at { nil }
+
+    trait :expired do
+      expires_at { 1.hour.ago }
+    end
+  end
+end

data/lib/spree/testing_support/store.rb

@@ -18,7 +18,8 @@ RSpec.configure do |config|
       I18n.with_locale(:en) do
         Spree::Events.disable do
           @default_country = Spree::Country.find_by(iso: 'US') || FactoryBot.create(:country_us)
-          @default_store = Spree::Store.find_by(default: true) || FactoryBot.create(:store, default: true, default_country: @default_country, default_currency: 'USD')
+          @default_store = Spree::Store.find_by(default: true) || FactoryBot.create(:store, default: true, default_currency: 'USD')
+          @default_store.update_column(:default_country_id, @default_country.id) unless @default_store.read_attribute(:default_country_id) == @default_country.id
         end
       end
     end
@@ -28,7 +29,7 @@ RSpec.configure do |config|
     unless self.class.metadata[:without_global_store]
       @default_store&.products = []
       @default_store&.promotions = []
-      @default_store&.checkout_zone = nil
+      @default_store&.update_column(:checkout_zone_id, nil) if @default_store&.read_attribute(:checkout_zone_id).present?
       @default_store&.payment_methods = []
     end
   end

data/lib/spree/webhooks.rb

@@ -1,22 +1,22 @@
 module Spree
   module Webhooks
     def self.disable_webhooks
-      Spree::Deprecation.warn('Spree::Webhooks.disable_webhooks is deprecated. Use Spree::LegacyWebhooks.disable_webhooks instead.')
+      Spree::Deprecation.warn('Spree::Webhooks.disable_webhooks is deprecated and will be removed in Spree 5.5. Use Spree::LegacyWebhooks.disable_webhooks instead.')
       prev_value = disabled?
-      RequestStore.store[:disable_spree_legacy_webhooks] = true
+      Thread.current[:disable_spree_legacy_webhooks] = true
       yield
     ensure
-      RequestStore.store[:disable_spree_legacy_webhooks] = prev_value
+      Thread.current[:disable_spree_legacy_webhooks] = prev_value
     end
 
     def self.disabled?
-      Spree::Deprecation.warn('Spree::Webhooks.disabled? is deprecated. Use Spree::LegacyWebhooks.disabled? instead.')
-      RequestStore.fetch(:disable_spree_legacy_webhooks) { false }
+      Spree::Deprecation.warn('Spree::Webhooks.disabled? is deprecated and will be removed in Spree 5.5. Use Spree::LegacyWebhooks.disabled? instead.')
+      !!Thread.current[:disable_spree_legacy_webhooks]
     end
 
     def self.disabled=(value)
-      Spree::Deprecation.warn('Spree::Webhooks.disabled= is deprecated. Use Spree::LegacyWebhooks.disabled= instead.')
-      RequestStore.store[:disable_spree_legacy_webhooks] = value
+      Spree::Deprecation.warn('Spree::Webhooks.disabled= is deprecated and will be removed in Spree 5.5. Use Spree::LegacyWebhooks.disabled= instead.')
+      Thread.current[:disable_spree_legacy_webhooks] = value
     end
   end
 end

data/lib/tasks/images.rake

@@ -0,0 +1,20 @@
+namespace :spree do
+  namespace :images do
+    desc 'Backfill thumbnail_id for all variants and products'
+    task backfill_thumbnails: :environment do
+      puts 'Backfilling variant thumbnails...'
+      Spree::Variant.where(thumbnail_id: nil).where.not(image_count: 0).find_each do |variant|
+        first_image = variant.images.order(:position).first
+        variant.update_column(:thumbnail_id, first_image.id) if first_image
+      end
+
+      puts 'Backfilling product thumbnails...'
+      Spree::Product.where(thumbnail_id: nil).where.not(total_image_count: 0).find_each do |product|
+        first_image = product.variant_images.order(:position).first
+        product.update_column(:thumbnail_id, first_image.id) if first_image
+      end
+
+      puts 'Done!'
+    end
+  end
+end

data/lib/tasks/markets.rake

@@ -0,0 +1,40 @@
+namespace :spree do
+  namespace :markets do
+    desc 'Migrate checkout zones to markets and nullify checkout_zone_id'
+    task migrate_checkout_zones: :environment do
+      Spree::Store.find_each do |store|
+        next if store.markets.exists?
+
+        checkout_zone_id = store.read_attribute(:checkout_zone_id)
+        zone = Spree::Zone.find_by(id: checkout_zone_id) if checkout_zone_id
+
+        countries = if zone
+                      zone.country_list.to_a
+                    else
+                      default_country = Spree::Country.find_by(id: store.read_attribute(:default_country_id))
+                      default_country ? [default_country] : []
+                    end
+
+        if countries.empty?
+          puts "  Skipping store '#{store.name}' (#{store.code}) — no countries to migrate"
+          next
+        end
+
+        primary_country = countries.first
+        iso_country = ISO3166::Country[primary_country.iso] if primary_country
+
+        market = store.markets.create!(
+          name: primary_country&.name || 'Default',
+          currency: iso_country&.currency_code || store.read_attribute(:default_currency) || 'USD',
+          default_locale: iso_country&.languages_official&.first || store.read_attribute(:default_locale) || 'en',
+          default: true,
+          countries: countries
+        )
+
+        store.update_column(:checkout_zone_id, nil) if checkout_zone_id
+
+        puts "  Created market '#{market.name}' with #{countries.size} countries for store '#{store.name}' (#{store.code})"
+      end
+    end
+  end
+end

data/lib/tasks/sample_data.rake

@@ -0,0 +1,15 @@
+namespace :spree do
+  desc 'Loads sample data (products, customers, orders, configuration)'
+  task load_sample_data: :environment do
+    Spree::SampleData::Loader.call
+  end
+end
+
+# Backwards compatibility
+namespace :spree_sample do
+  desc '[DEPRECATED] Use spree:load_sample_data instead'
+  task load: :environment do
+    warn '[DEPRECATION] `rake spree_sample:load` is deprecated. Use `rake spree:load_sample_data` instead.'
+    Rake::Task['spree:load_sample_data'].invoke
+  end
+end

data/spec/fixtures/files/customers_import.csv

@@ -0,0 +1,4 @@
+email,first_name,last_name,phone,accepts_email_marketing,tags,company,address1,address2,city,province_code,country_code,zip
+jane.smith@example.com,Jane,Smith,555-0101,yes,"VIP, Wholesale",Acme Corp,123 Main St,Apt 4,New York,NY,US,10001
+john.doe@example.com,John,Doe,555-0202,no,VIP,,456 Oak Ave,,Los Angeles,CA,US,90001
+maria.garcia@example.com,Maria,Garcia,,,Returning,,,,,,,