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.

Fixed undefined method 'update_thumbnail!' for nil (#14018)

Damian Legawiecfda98dd16b5d
diff --git a/spree/admin/spec/controllers/spree/admin/assets_controller_spec.rb b/spree/admin/spec/controllers/spree/admin/assets_controller_spec.rb
index 16df07895c..0412b06013 100644
--- a/spree/admin/spec/controllers/spree/admin/assets_controller_spec.rb
+++ b/spree/admin/spec/controllers/spree/admin/assets_controller_spec.rb
@@ -29,6 +29,22 @@ describe Spree::Admin::AssetsController, type: :controller do
end
end
+ # Reproduces the new-product upload flow: the media form is rendered before
+ # the product exists, so viewable_type is set but viewable_id is blank.
+ # The thumbnail/counter callbacks must skip cleanly instead of dereferencing
+ # a nil viewable.
+ context 'with viewable_type but blank viewable_id' do
+ let(:params) { { asset: { alt: 'orphan', attachment: attachment, viewable_type: 'Spree::Product', viewable_id: '' } } }
+
+ it 'creates an orphan asset without raising' do
+ expect { subject }.to change(Spree::Asset, :count).by(1)
+
+ expect(response).to have_http_status(:ok)
+ expect(asset.viewable).to be_nil
+ expect(asset.session_id).to eq(request.session['spree.admin.uploaded_assets.spree/product.uuid'])
+ end
+ end
+
context 'with viewable' do
subject { post :create, params: params, format: :turbo_stream }
diff --git a/spree/core/app/models/spree/asset.rb b/spree/core/app/models/spree/asset.rb
index c0dbb73f98..7266e8e5f7 100644
--- a/spree/core/app/models/spree/asset.rb
+++ b/spree/core/app/models/spree/asset.rb
@@ -172,31 +172,31 @@ module Spree
end
def increment_viewable_media_count
- case viewable_type
- when 'Spree::Variant'
+ case viewable
+ when Spree::Variant
Spree::Variant.increment_counter(:media_count, viewable_id)
Spree::Product.increment_counter(:media_count, viewable.product_id)
- when 'Spree::Product'
+ when Spree::Product
Spree::Product.increment_counter(:media_count, viewable_id)
end
end
def decrement_viewable_media_count
- case viewable_type
- when 'Spree::Variant'
+ case viewable
+ when Spree::Variant
Spree::Variant.decrement_counter(:media_count, viewable_id)
Spree::Product.decrement_counter(:media_count, viewable.product_id)
- when 'Spree::Product'
+ when Spree::Product
Spree::Product.decrement_counter(:media_count, viewable_id)
end
end
def update_viewable_thumbnail
- case viewable_type
- when 'Spree::Variant'
+ case viewable
+ when Spree::Variant
viewable.update_thumbnail!
viewable.product.update_thumbnail!
- when 'Spree::Product'
+ when Spree::Product
viewable.update_thumbnail!
# Linked variants resolve their own thumbnail through gallery_media,
# which sorts by this asset's product-level position. Reorders or
diff --git a/spree/core/spec/models/spree/asset_spec.rb b/spree/core/spec/models/spree/asset_spec.rb
index 22cc1361fa..98247b430d 100644
--- a/spree/core/spec/models/spree/asset_spec.rb
+++ b/spree/core/spec/models/spree/asset_spec.rb
@@ -122,6 +122,18 @@ describe Spree::Asset, type: :model do
end
end
+ # New-product uploads in the admin save assets with viewable_type set but
+ # viewable_id still blank — the product doesn't exist yet. Callbacks must
+ # not dereference the missing viewable.
+ describe 'orphan asset (viewable_type set, viewable_id nil)' do
+ it 'creates and destroys without raising' do
+ asset = nil
+ expect { asset = create(:image, viewable_type: 'Spree::Product', viewable_id: nil) }.not_to raise_error
+ expect(asset.viewable).to be_nil
+ expect { asset.destroy! }.not_to raise_error
+ end
+ end
+
describe 'delegated methods' do
let(:asset) { create(:image) }
let(:attachment) { asset.attachment }