Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Enforce strict validation of fulfillment types

Damian Legawiecf52f7df85580
diff --git a/packages/admin-sdk/src/admin-client.ts b/packages/admin-sdk/src/admin-client.ts
index af9b109014..d873d1c802 100644
--- a/packages/admin-sdk/src/admin-client.ts
+++ b/packages/admin-sdk/src/admin-client.ts
@@ -182,6 +182,7 @@ import type {
Export,
Fee,
Fulfillment,
+ FulfillmentProviderOption,
GiftCard,
GiftCardBatch,
Import,
@@ -1268,6 +1269,20 @@ export class AdminClient {
options,
),
+ /**
+ * Registered fulfillment provider strategies plus the registered
+ * fulfillment-type vocabulary (the strict set delivery methods and
+ * product types validate against).
+ */
+ fulfillmentProviders: (
+ options?: RequestOptions,
+ ): Promise<{ data: FulfillmentProviderOption[]; fulfillment_types: string[] }> =>
+ this.request<{ data: FulfillmentProviderOption[]; fulfillment_types: string[] }>(
+ 'GET',
+ '/delivery_methods/fulfillment_providers',
+ options,
+ ),
+
/** Eligibility rules on a delivery method (item total / weight bounds, …). */
rules: {
list: (
diff --git a/packages/admin-sdk/src/types/fulfillment-providers.ts b/packages/admin-sdk/src/types/fulfillment-providers.ts
new file mode 100644
index 0000000000..be1c8d1755
--- /dev/null
+++ b/packages/admin-sdk/src/types/fulfillment-providers.ts
@@ -0,0 +1,18 @@
+/**
+ * A registered `Spree::FulfillmentProvider` strategy, as returned by
+ * `GET /delivery_methods/fulfillment_providers`. Providers perform the
+ * mechanics of a fulfillment (dispatch, tracking, cancellation) — which is a
+ * separate choice from the delivery method's `fulfillment_type`, since one
+ * type can be handled by several providers (a shipping method might be
+ * fulfilled manually, or through a carrier integration).
+ */
+export interface FulfillmentProviderOption {
+ /** Ruby class name, e.g. `Spree::FulfillmentProvider::Pickup`. */
+ type: string
+ /** Human-readable name for display. */
+ name: string
+ /** Fulfillment types this provider handles; empty means any type. */
+ fulfillment_types: string[]
+ /** Whether fulfillments handled by this provider ship to a customer address. */
+ requires_address: boolean
+}
diff --git a/packages/admin-sdk/src/types/index.ts b/packages/admin-sdk/src/types/index.ts
index ed331d2e5d..fd3629935f 100644
--- a/packages/admin-sdk/src/types/index.ts
+++ b/packages/admin-sdk/src/types/index.ts
@@ -7,7 +7,8 @@ export type {
PaginatedResponse,
PaginationMeta,
} from '@spree/sdk-core'
-
+// Hand-written discovery-endpoint types (controller-shaped, not generated)
+export type { FulfillmentProviderOption } from './fulfillment-providers'
// Admin-specific generated types
export type { default as Address } from './generated/Address'
export type { default as AdminUser } from './generated/AdminUser'
diff --git a/packages/dashboard/e2e/delivery-settings.spec.ts b/packages/dashboard/e2e/delivery-settings.spec.ts
index b64ab8eac6..0471694b58 100644
--- a/packages/dashboard/e2e/delivery-settings.spec.ts
+++ b/packages/dashboard/e2e/delivery-settings.spec.ts
@@ -53,6 +53,11 @@ test.describe('delivery methods', () => {
await page.getByRole('combobox').first().click()
await page.getByRole('option', { name: /^pickup$/i }).click()
+ // Choosing pickup reveals the provider field (several providers handle the
+ // type) and suggests the one that actually does pickup, not generic Manual.
+ await expect(page.getByText(/fulfillment provider/i)).toBeVisible()
+ await expect(page.getByRole('combobox').nth(1)).toHaveText(/pickup/i)
+
await page.getByRole('button', { name: /create delivery method/i }).click()
await expect(page.getByText(name)).toBeVisible({ timeout: 15_000 })
diff --git a/packages/dashboard/src/hooks/use-delivery-methods.ts b/packages/dashboard/src/hooks/use-delivery-methods.ts
index d292a1a537..c688f5ce39 100644
--- a/packages/dashboard/src/hooks/use-delivery-methods.ts
+++ b/packages/dashboard/src/hooks/use-delivery-methods.ts
@@ -24,6 +24,14 @@ export function useDeliveryCalculators() {
})
}
+export function useFulfillmentProviders() {
+ return useQuery({
+ queryKey: useResourceKey('delivery-methods', 'fulfillment-providers'),
+ queryFn: () => adminClient.deliveryMethods.fulfillmentProviders(),
+ staleTime: 1000 * 60 * 30,
+ })
+}
+
export function useCreateDeliveryMethod() {
return useResourceMutation<DeliveryMethod, Error, DeliveryMethodParams>({
mutationFn: (params) => adminClient.deliveryMethods.create(params),
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/delivery-methods.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/delivery-methods.tsx
index ea593813c2..14ea8db8b8 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/delivery-methods.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/delivery-methods.tsx
@@ -42,7 +42,7 @@ import {
import { useMutation, useQueryClient } from '@tanstack/react-query'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
import { PlusIcon, Trash2Icon } from 'lucide-react'
-import { useEffect, useState } from 'react'
+import { useEffect, useMemo, useState } from 'react'
import { Controller, type UseFormReturn, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
@@ -53,6 +53,7 @@ import {
useDeliveryMethod,
useDeliveryMethodRules,
useDeliveryMethodRuleTypes,
+ useFulfillmentProviders,
useUpdateDeliveryMethod,
} from '../../../../hooks/use-delivery-methods'
import { useDeliveryZones } from '../../../../hooks/use-delivery-zones'
@@ -248,6 +249,8 @@ function EditDeliveryMethodSheet({
fulfillment_type:
(deliveryMethod.fulfillment_type as DeliveryMethodFormValues['fulfillment_type']) ??
'shipping',
+ fulfillment_provider:
+ deliveryMethod.fulfillment_provider ?? DELIVERY_METHOD_DEFAULTS.fulfillment_provider,
storefront_visible: deliveryMethod.storefront_visible,
tracking_url: deliveryMethod.tracking_url ?? '',
estimated_transit_business_days_min:
@@ -439,6 +442,7 @@ function DeliveryMethodFormFields({ form }: { form: UseFormReturn<DeliveryMethod
const { t } = useTranslation()
const { errors } = form.formState
const { data: calculators } = useDeliveryCalculators()
+ const { data: fulfillmentProviders } = useFulfillmentProviders()
const { data: zones } = useDeliveryZones()
const { data: stockLocations } = useStockLocations()
const { data: taxCategories } = useTaxCategories()
@@ -446,9 +450,12 @@ function DeliveryMethodFormFields({ form }: { form: UseFormReturn<DeliveryMethod
const fulfillmentType = form.watch('fulfillment_type')
const calculatorType = form.watch('calculator_type')
- const fulfillmentTypeOptions = FULFILLMENT_TYPES.map((value) => ({
+ // Registry-driven: extension-registered types appear without a dashboard
+ // change; the shipped const only covers the pre-fetch render.
+ const registeredFulfillmentTypes = fulfillmentProviders?.fulfillment_types ?? FULFILLMENT_TYPES
+ const fulfillmentTypeOptions = registeredFulfillmentTypes.map((value) => ({
value,
- label: t(`admin.delivery_methods.fulfillment_types.${value}`),
+ label: t(`admin.delivery_methods.fulfillment_types.${value}`, { defaultValue: value }),
}))
const calculatorOptions = (calculators?.data ?? []).map((calculator) => ({
@@ -456,6 +463,40 @@ function DeliveryMethodFormFields({ form }: { form: UseFormReturn<DeliveryMethod
label: calculator.name,
}))
+ // Providers with no declared types (Manual) handle anything.
+ const providersForType = useMemo(
+ () =>
+ (fulfillmentProviders?.data ?? []).filter(
+ (provider) =>
+ provider.fulfillment_types.length === 0 ||
+ provider.fulfillment_types.includes(fulfillmentType),
+ ),
+ [fulfillmentProviders, fulfillmentType],
+ )
+ const providerOptions = providersForType.map((provider) => ({
+ value: provider.type,
+ label: provider.name,
+ }))
+
+ // Suggest a provider whenever the admin picks a fulfillment type: prefer one
+ // that declares that type (Pickup for pickup), since the generic Manual
+ // fallback would otherwise keep dispatch and address rules wrong. Only the
+ // untouched field is steered — an explicit choice is never overwritten.
+ const fulfillmentProvider = form.watch('fulfillment_provider')
+ const providerDirty = !!form.formState.dirtyFields.fulfillment_provider
+ useEffect(() => {
+ if (providersForType.length === 0) return
+
+ const stillValid = providersForType.some((provider) => provider.type === fulfillmentProvider)
+ if (stillValid && providerDirty) return
+
+ const specific = providersForType.find((provider) => provider.fulfillment_types.length > 0)
+ const suggested = specific ?? providersForType[0]
+ if (suggested.type === fulfillmentProvider) return
+
+ form.setValue('fulfillment_provider', suggested.type)
+ }, [providersForType, fulfillmentProvider, providerDirty, form])
+
const selectedCalculator = (calculators?.data ?? []).find((c) => c.type === calculatorType)
const preferenceSchema = (selectedCalculator?.preference_schema ?? []) as PreferenceField[]
@@ -521,6 +562,33 @@ function DeliveryMethodFormFields({ form }: { form: UseFormReturn<DeliveryMethod
/>
</Field>
+ {providerOptions.length > 1 && (
+ <Field>
+ <FieldLabel>{t('admin.fields.delivery_method.fulfillment_provider.label')}</FieldLabel>
+ <Controller
+ name="fulfillment_provider"
+ control={form.control}
+ render={({ field }) => (
+ <Select items={providerOptions} value={field.value} onValueChange={field.onChange}>
+ <SelectTrigger>
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ {providerOptions.map((option) => (
+ <SelectItem key={option.value} value={option.value}>
+ {option.label}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ )}
+ />
+ <span className="text-muted-foreground text-xs">
+ {t('admin.fields.delivery_method.fulfillment_provider.help')}
+ </span>
+ </Field>
+ )}
+
{fulfillmentType === 'pickup' && (
<Field>
<FieldLabel>{t('admin.fields.delivery_method.pickup_locations.label')}</FieldLabel>
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/product-types.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/product-types.tsx
index 674033d81c..ca146fa9da 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/product-types.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/product-types.tsx
@@ -33,6 +33,7 @@ import { useEffect } from 'react'
import { Controller, type UseFormReturn, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
+import { useFulfillmentProviders } from '../../../../hooks/use-delivery-methods'
import {
useCreateProductType,
useDeleteProductType,
@@ -285,6 +286,10 @@ function EditProductTypeSheet({
function ProductTypeFormFields({ form }: { form: UseFormReturn<ProductTypeFormValues> }) {
const { t } = useTranslation()
const { errors } = form.formState
+ const { data: fulfillmentProviders } = useFulfillmentProviders()
+ // Registry-driven: extension-registered types appear without a dashboard
+ // change; the shipped const only covers the pre-fetch render.
+ const registeredFulfillmentTypes = fulfillmentProviders?.fulfillment_types ?? FULFILLMENT_TYPES
return (
<FieldGroup>
@@ -315,7 +320,7 @@ function ProductTypeFormFields({ form }: { form: UseFormReturn<ProductTypeFormVa
control={form.control}
render={({ field }) => (
<div className="flex flex-col gap-2">
- {FULFILLMENT_TYPES.map((fulfillmentType) => {
+ {registeredFulfillmentTypes.map((fulfillmentType) => {
const checked = field.value.includes(fulfillmentType)
return (
<label
@@ -334,7 +339,9 @@ function ProductTypeFormFields({ form }: { form: UseFormReturn<ProductTypeFormVa
)
}}
/>
- {t(`admin.delivery_methods.fulfillment_types.${fulfillmentType}`)}
+ {t(`admin.delivery_methods.fulfillment_types.${fulfillmentType}`, {
+ defaultValue: fulfillmentType,
+ })}
</label>
)
})}
diff --git a/packages/dashboard/src/schemas/delivery-method.ts b/packages/dashboard/src/schemas/delivery-method.ts
index 9ae45aa7cb..03a8ed11bb 100644
--- a/packages/dashboard/src/schemas/delivery-method.ts
+++ b/packages/dashboard/src/schemas/delivery-method.ts
@@ -7,6 +7,7 @@ export const deliveryMethodFormSchema = z.object({
admin_name: z.string().optional(),
code: z.string().optional(),
fulfillment_type: z.enum(FULFILLMENT_TYPES),
+ fulfillment_provider: z.string(),
storefront_visible: z.boolean(),
tracking_url: z.string().optional(),
estimated_transit_business_days_min: z.string().optional(),
@@ -25,6 +26,7 @@ export const DELIVERY_METHOD_DEFAULTS: DeliveryMethodFormValues = {
admin_name: '',
code: '',
fulfillment_type: 'shipping',
+ fulfillment_provider: 'Spree::FulfillmentProvider::Manual',
storefront_visible: true,
tracking_url: '',
estimated_transit_business_days_min: '',
@@ -42,6 +44,7 @@ export function deliveryMethodValuesToParams(values: DeliveryMethodFormValues) {
admin_name: values.admin_name || null,
code: values.code || null,
fulfillment_type: values.fulfillment_type,
+ fulfillment_provider: values.fulfillment_provider,
storefront_visible: values.storefront_visible,
tracking_url: values.tracking_url || null,
estimated_transit_business_days_min: values.estimated_transit_business_days_min
diff --git a/spree/api/app/controllers/spree/api/v3/admin/delivery_methods_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/delivery_methods_controller.rb
index bac2bd218c..9e6670bca3 100644
--- a/spree/api/app/controllers/spree/api/v3/admin/delivery_methods_controller.rb
+++ b/spree/api/app/controllers/spree/api/v3/admin/delivery_methods_controller.rb
@@ -22,6 +22,26 @@ module Spree
render json: { data: data }
end
+ # GET /api/v3/admin/delivery_methods/fulfillment_providers
+ # Registered FulfillmentProvider strategies plus the registered
+ # fulfillment-type vocabulary (Spree.fulfillment_types — the strict
+ # set both DeliveryMethod and ProductType validate against), so
+ # admin UIs render both lists from the registry, not JS constants.
+ def fulfillment_providers
+ authorize! :create, model_class
+
+ data = Spree.fulfillment_providers.map do |provider_class|
+ {
+ type: provider_class.to_s,
+ name: provider_class.provider_name,
+ fulfillment_types: provider_class.fulfillment_types,
+ requires_address: provider_class.new.requires_address?
+ }
+ end
+
+ render json: { data: data, fulfillment_types: Spree.fulfillment_types }
+ end
+
def create
@resource = model_class.new(assignable_params)
authorize_resource!(@resource, :create)
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/delivery_methods_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/delivery_methods_controller_spec.rb
index 7c8d5f78d2..10dd3ee298 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/delivery_methods_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/delivery_methods_controller_spec.rb
@@ -33,9 +33,44 @@ RSpec.describe Spree::Api::V3::Admin::DeliveryMethodsController, type: :controll
end
end
+ describe 'GET #fulfillment_providers' do
+ it 'lists registered providers with the fulfillment types they handle' do
+ get :fulfillment_providers, params: {}, as: :json
+
+ expect(response).to have_http_status(:ok)
+ pickup = json_response['data'].find { |row| row['type'] == 'Spree::FulfillmentProvider::Pickup' }
+ expect(pickup['name']).to eq('Pickup')
+ expect(pickup['fulfillment_types']).to eq(['pickup'])
+ expect(pickup['requires_address']).to be false
+
+ manual = json_response['data'].find { |row| row['type'] == 'Spree::FulfillmentProvider::Manual' }
+ expect(manual['fulfillment_types']).to eq([])
+ expect(manual['requires_address']).to be true
+
+ expect(json_response['fulfillment_types']).to eq(Spree.fulfillment_types)
+ end
+ end
+
describe 'POST #create' do
let!(:zone) { create(:delivery_zone) }
+ it 'rejects an unregistered fulfillment type with 422' do
+ post :create, params: { name: 'Typo', fulfillment_type: 'pickpu' }, as: :json
+
+ expect(response).to have_http_status(:unprocessable_entity)
+ end
+
+ it 'persists the chosen fulfillment provider' do
+ post :create, params: {
+ name: 'Store pickup',
+ fulfillment_type: 'pickup',
+ fulfillment_provider: 'Spree::FulfillmentProvider::Pickup'
+ }, as: :json
+
+ expect(response).to have_http_status(:created)
+ expect(json_response['fulfillment_provider']).to eq('Spree::FulfillmentProvider::Pickup')
+ end
+
it 'creates a delivery method with calculator and zones' do
post :create, params: {
name: 'Express',
diff --git a/spree/api/spec/controllers/spree/api/v3/store/delivery_methods_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/delivery_methods_controller_spec.rb
index 6c8f5cad7d..c2a70164f9 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/delivery_methods_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/delivery_methods_controller_spec.rb
@@ -92,8 +92,14 @@ RSpec.describe Spree::Api::V3::Store::DeliveryMethodsController, type: :controll
context 'with a cart' do
let(:cart) { create(:cart_with_line_items, store: store, customer: user) }
let(:variant) { cart.line_items.first.variant }
+ let(:pickup_capable_type) { create(:product_type, name: 'Collectable', fulfillment_types: %w[shipping pickup]) }
- before { request.headers['x-spree-token'] = cart.token }
+ before do
+ request.headers['x-spree-token'] = cart.token
+ # Coverage only counts pickup-collectable items, so the cart's
+ # products must support pickup for the stock checks to matter.
+ cart.line_items.each { |line_item| line_item.variant.product.update!(product_type: pickup_capable_type) }
+ end
it 'keeps locations that can fulfill the whole cart from local stock' do
pickup_location.stock_item_or_create(variant).set_count_on_hand(10)
@@ -110,6 +116,18 @@ RSpec.describe Spree::Api::V3::Store::DeliveryMethodsController, type: :controll
expect(json_response['data'].map { |row| row['name'] }).not_to include('Downtown')
end
+
+ it 'ignores items the counter will never hand over (mixed cart with a tracked digital item)' do
+ pickup_location.stock_item_or_create(variant).set_count_on_hand(10)
+
+ digital_type = create(:product_type, name: 'Digital good', fulfillment_types: ['digital'])
+ digital_product = create(:product, product_type: digital_type, store: store)
+ create(:line_item, cart: cart, order: nil, variant: digital_product.default_variant)
+
+ get :pickup_locations, params: { id: pickup_method.prefixed_id, cart_id: cart.prefixed_id }, as: :json
+
+ expect(json_response['data'].map { |row| row['name'] }).to include('Downtown')
+ end
end
end
diff --git a/spree/core/app/models/spree/delivery_method.rb b/spree/core/app/models/spree/delivery_method.rb
index 8cddbe5739..baabf8a0f4 100644
--- a/spree/core/app/models/spree/delivery_method.rb
+++ b/spree/core/app/models/spree/delivery_method.rb
@@ -56,6 +56,13 @@ module Spree
has_many :zones, through: :delivery_method_zones, source: :delivery_zone, deprecated: true
validates :name, :display_on, :fulfillment_type, presence: true
+ # Strict vocabulary: an unregistered type silently matches no product
+ # (empty intersection — no error, just missing rates), so typos must
+ # fail loudly. Validated on change only: rows migrated with tokens not
+ # yet registered in an initializer stay loadable and savable.
+ validates :fulfillment_type,
+ inclusion: { in: -> (_record) { Spree.fulfillment_types } },
+ if: :fulfillment_type_changed?
validates :estimated_transit_business_days_min, numericality: { greater_than_or_equal_to: 1 }, allow_nil: true
validates :estimated_transit_business_days_max, numericality: { greater_than_or_equal_to: 1 }, allow_nil: true
diff --git a/spree/core/app/models/spree/product_type.rb b/spree/core/app/models/spree/product_type.rb
index 28d0f682e9..4dec80af5c 100644
--- a/spree/core/app/models/spree/product_type.rb
+++ b/spree/core/app/models/spree/product_type.rb
@@ -26,6 +26,7 @@ module Spree
validates :name, presence: true, uniqueness: { case_sensitive: false, scope: :store_id }
validates :store, presence: true
validates :fulfillment_types, presence: true
+ validate :fulfillment_types_must_be_registered, if: :fulfillment_types_changed?
self.whitelisted_ransackable_attributes = %w[name]
self.whitelisted_ransackable_associations = %w[option_types]
@@ -39,5 +40,23 @@ module Spree
def requires_shipping?
fulfillment_types.include?('shipping')
end
+
+ private
+
+ # Strict vocabulary against Spree.fulfillment_types — an unregistered
+ # token silently removes the product from every delivery method's
+ # eligibility, so typos must fail loudly. Change-only, so rows migrated
+ # ahead of their initializer registration stay loadable and savable.
+ def fulfillment_types_must_be_registered
+ unregistered = Array(fulfillment_types).map(&:to_s) - Spree.fulfillment_types
+ return if unregistered.empty?
+
+ errors.add(
+ :fulfillment_types,
+ Spree.t(:unregistered_fulfillment_types, scope: [:errors, :messages],
+ types: unregistered.join(', '),
+ default: "contains unregistered fulfillment types: #{unregistered.join(', ')}")
+ )
+ end
end
end
diff --git a/spree/core/config/locales/en.yml b/spree/core/config/locales/en.yml
index d05b8f1c87..9ae0a59d83 100644
--- a/spree/core/config/locales/en.yml
+++ b/spree/core/config/locales/en.yml
@@ -247,6 +247,7 @@ en:
errors:
messages:
blank: can't be blank
+ unregistered_fulfillment_types: "contains unregistered fulfillment types: %{types}"
models:
spree/allowed_origin:
attributes:
diff --git a/spree/core/spec/models/spree/delivery_method_spec.rb b/spree/core/spec/models/spree/delivery_method_spec.rb
index 1f4b54810e..34d6ba48e4 100644
--- a/spree/core/spec/models/spree/delivery_method_spec.rb
+++ b/spree/core/spec/models/spree/delivery_method_spec.rb
@@ -80,6 +80,29 @@ describe Spree::DeliveryMethod, type: :model do
expect(subject.errors.messages[:name].size).to eq(1)
end
+ it 'rejects a fulfillment type outside the Spree.fulfillment_types registry' do
+ method = build(:delivery_method, fulfillment_type: 'pickpu')
+
+ expect(method).not_to be_valid
+ expect(method.errors[:fulfillment_type]).to be_present
+ end
+
+ it 'accepts a custom type once registered' do
+ Spree.fulfillment_types << 'same_day_courier'
+
+ expect(build(:delivery_method, fulfillment_type: 'same_day_courier')).to be_valid
+ ensure
+ Spree.fulfillment_types.delete('same_day_courier')
+ end
+
+ it 'leaves persisted rows with unregistered types loadable and savable' do
+ method = create(:delivery_method)
+ method.update_column(:fulfillment_type, 'legacy_freight')
+
+ method.reload.name = 'Renamed'
+ expect(method.save).to be true
+ end
+
it 'defaults display_on and rejects explicit blank' do
expect(subject.display_on).to eq('both')
diff --git a/spree/core/spec/models/spree/product_type_spec.rb b/spree/core/spec/models/spree/product_type_spec.rb
index f2abf2192f..ec02ad4b82 100644
--- a/spree/core/spec/models/spree/product_type_spec.rb
+++ b/spree/core/spec/models/spree/product_type_spec.rb
@@ -13,6 +13,29 @@ describe Spree::ProductType, type: :model do
expect(product_type.reload.fulfillment_types).to eq(%w[shipping pickup])
end
+
+ it 'rejects types outside the Spree.fulfillment_types registry' do
+ product_type = build(:product_type, fulfillment_types: %w[shipping freigt])
+
+ expect(product_type).not_to be_valid
+ expect(product_type.errors[:fulfillment_types].first).to include('freigt')
+ end
+
+ it 'accepts a custom type once registered' do
+ Spree.fulfillment_types << 'freight'
+
+ expect(build(:product_type, fulfillment_types: ['freight'])).to be_valid
+ ensure
+ Spree.fulfillment_types.delete('freight')
+ end
+
+ it 'leaves persisted rows with unregistered types savable when untouched' do
+ product_type = create(:product_type)
+ product_type.update_column(:fulfillment_types, ['legacy_freight'])
+
+ product_type.reload.name = 'Renamed'
+ expect(product_type.save).to be true
+ end
end
describe '#digital?' do