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 `Admin::ProductsHelper#media_form_assets` method (#12557)
Damian Legawieca14153425920
diff --git a/admin/app/helpers/spree/admin/products_helper.rb b/admin/app/helpers/spree/admin/products_helper.rbindex d071497af1..685c1a60b7 100644--- a/admin/app/helpers/spree/admin/products_helper.rb+++ b/admin/app/helpers/spree/admin/products_helper.rb@@ -34,6 +34,8 @@ module Spreevariant.imageselsif session_uploaded_assets.any?Spree::Image.accessible_by(current_ability, :manage).where(id: session_uploaded_assets)+ else+ []endenddiff --git a/admin/spec/controllers/spree/admin/products_controller_spec.rb b/admin/spec/controllers/spree/admin/products_controller_spec.rbindex d9c4676e29..b9be9880fe 100644--- a/admin/spec/controllers/spree/admin/products_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/products_controller_spec.rb@@ -3,6 +3,8 @@ require 'spec_helper'RSpec.describe Spree::Admin::ProductsController, type: :controller dostub_authorization!+ render_views+let(:user) { create(:admin_user) }let(:store) { @default_store }@@ -10,6 +12,13 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller doallow(controller).to receive(:current_ability).and_call_originalend+ describe '#GET #new' do+ it 'renders the new template' do+ get :new+ expect(response).to render_template(:new)+ end+ end+describe 'GET #index' doit 'can find a product by SKU' doproduct = create(:product, sku: 'ABC123', stores: [store])@@ -456,6 +465,24 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller doendend+ describe '#GET #edit' do+ let!(:product) { create(:product, stores: [store], status: 'active') }++ it 'renders the edit template' do+ get :edit, params: { id: product.to_param }+ expect(response).to render_template(:edit)+ end++ context 'with variants' do+ let!(:variant) { create(:variant, product: product) }++ it 'renders the edit template' do+ get :edit, params: { id: product.to_param }+ expect(response).to render_template(:edit)+ end+ end+ end+describe 'PUT #update' dolet!(:product) { create(:product, stores: [store], status: 'active') }let(:product_params) { { status: 'draft', make_active_at: Time.current.beginning_of_day } }diff --git a/admin/spec/helpers/spree/admin/products_helper_spec.rb b/admin/spec/helpers/spree/admin/products_helper_spec.rbindex b4cff59feb..b4e22e73b7 100644--- a/admin/spec/helpers/spree/admin/products_helper_spec.rb+++ b/admin/spec/helpers/spree/admin/products_helper_spec.rb@@ -1,6 +1,12 @@require 'spec_helper'describe Spree::Admin::ProductsHelper do+ let(:user) { create(:admin_user) }++ before do+ allow(helper).to receive(:current_ability).and_return(Spree::Ability.new(user))+ end+describe '#available_status' docontext 'when product is active' dolet(:product) { build(:product, status: :active) }@@ -42,4 +48,35 @@ describe Spree::Admin::ProductsHelper doendendend++ describe '#media_form_assets' do+ context 'when variant is persisted' do+ let(:variant) { build(:variant) }++ it 'returns the correct assets' do+ expect(helper.media_form_assets(variant)).to eq(variant.images)+ end+ end++ context 'when variant is not persisted' do+ let(:variant) { build(:variant, id: nil) }++ it 'returns an empty array' do+ expect(helper.media_form_assets(variant)).to eq([])+ end+ end++ context 'when there are session uploaded assets' do+ let(:variant) { build(:variant, id: nil) }+ let(:session_uploaded_assets) { [create(:image)] }++ before do+ allow(helper).to receive(:session_uploaded_assets).and_return(session_uploaded_assets)+ end++ it 'returns the correct assets' do+ expect(helper.media_form_assets(variant)).to eq(session_uploaded_assets)+ end+ end+ endend