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 `Admin::ProductsHelper#available_status` + added more specs (#12476)

Damian Legawiec2e82ce8f5619
diff --git a/admin/app/helpers/spree/admin/orders_helper.rb b/admin/app/helpers/spree/admin/orders_helper.rb
index 0e44a1910e..02e38058e9 100644
--- a/admin/app/helpers/spree/admin/orders_helper.rb
+++ b/admin/app/helpers/spree/admin/orders_helper.rb
@@ -149,15 +149,15 @@ module Spree
end
def order_filter_dropdown_value
- if params[:q][:shipment_state_not_in] == ['shipped', 'canceled']
+ if params.dig(:q, :shipment_state_not_in) == ['shipped', 'canceled']
Spree.t('admin.orders.unfulfilled')
- elsif params[:q][:shipment_state_eq] == 'shipped'
+ elsif params.dig(:q, :shipment_state_eq) == 'shipped'
Spree.t('admin.orders.fulfilled')
- elsif params[:q][:state_in] == ['canceled','partially_canceled']
+ elsif params.dig(:q, :state_in) == ['canceled','partially_canceled']
Spree.t('admin.orders.canceled')
- elsif params.dig(:q, :refunded) && params[:q][:refunded].present?
+ elsif params.dig(:q, :refunded)&.present?
Spree.t('admin.orders.refunded')
- elsif params.dig(:q, :partially_refunded) && params[:q][:partially_refunded].present?
+ elsif params.dig(:q, :partially_refunded)&.present?
Spree.t('admin.orders.partially_refunded')
else
Spree.t('admin.orders.all_orders')
diff --git a/admin/app/helpers/spree/admin/products_helper.rb b/admin/app/helpers/spree/admin/products_helper.rb
index cca3f82e9f..d071497af1 100644
--- a/admin/app/helpers/spree/admin/products_helper.rb
+++ b/admin/app/helpers/spree/admin/products_helper.rb
@@ -64,7 +64,7 @@ module Spree
return Spree.t('admin.products.draft') if product.draft?
return Spree.t('admin.products.active') if product.available?
return Spree.t('admin.products.archived') if product.archived?
- return Spree.t('admin.products.paused') if product.paused?
+ return Spree.t('admin.products.paused') if product.respond_to?(:paused?) && product.paused?
return Spree.t('admin.products.deleted') if product.deleted?
return ''
end
@@ -87,7 +87,7 @@ module Spree
end
def product_filter_status_dropdown_value
- case params[:q][:status_eq]
+ case params.dig(:q, :status_eq)
when 'active'
Spree.t('admin.products.active')
when 'draft'
@@ -100,9 +100,9 @@ module Spree
end
def product_filter_stock_dropdown_value
- if params[:q][:in_stock_items] == '1'
+ if params.dig(:q, :in_stock_items) == '1'
Spree.t('admin.products.in_stock')
- elsif params[:q][:out_of_stock_items] == '1'
+ elsif params.dig(:q, :out_of_stock_items) == '1'
Spree.t('admin.products.out_of_stock')
else
Spree.t('admin.products.any_stock')
diff --git a/admin/spec/helpers/spree/admin/base_helper_spec.rb b/admin/spec/helpers/spree/admin/base_helper_spec.rb
index 8e9bb0b2e8..c9129d5f8a 100644
--- a/admin/spec/helpers/spree/admin/base_helper_spec.rb
+++ b/admin/spec/helpers/spree/admin/base_helper_spec.rb
@@ -20,4 +20,33 @@ describe Spree::Admin::BaseHelper do
end
end
end
+
+ describe '#external_page_preview_link' do
+ let(:current_store) { create(:store) }
+ let(:product) { create(:product, stores: [current_store]) }
+
+ def spree_storefront_resource_url(*_args); end
+ def button_link_to(*_args); end
+ def link_to_with_icon(*_args); end
+
+ context 'for product' do
+ context 'when product is a draft' do
+ before { product.update(status: :draft) }
+
+ it 'should call spree_storefront_resource_url with preview_id' do
+ expect(self).to receive(:spree_storefront_resource_url).with(product, preview_id: product.id)
+
+ external_page_preview_link(product)
+ end
+ end
+
+ context 'when product is not a draft' do
+ it 'should call spree_storefront_resource_url with preview_id' do
+ expect(self).to receive(:spree_storefront_resource_url).with(product, preview_id: product.id)
+
+ external_page_preview_link(product)
+ end
+ end
+ end
+ end
end
diff --git a/admin/spec/helpers/spree/admin/products_helper_spec.rb b/admin/spec/helpers/spree/admin/products_helper_spec.rb
new file mode 100644
index 0000000000..b4cff59feb
--- /dev/null
+++ b/admin/spec/helpers/spree/admin/products_helper_spec.rb
@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe Spree::Admin::ProductsHelper do
+ describe '#available_status' do
+ context 'when product is active' do
+ let(:product) { build(:product, status: :active) }
+
+ it 'returns the correct status' do
+ expect(available_status(product)).to eq('Active')
+ end
+ end
+
+ context 'when product is draft' do
+ let(:product) { build(:product, status: :draft) }
+
+ it 'returns the correct status' do
+ expect(available_status(product)).to eq('Draft')
+ end
+ end
+
+ context 'when product is archived' do
+ let(:product) { build(:product, status: :archived) }
+
+ it 'returns the correct status' do
+ expect(available_status(product)).to eq('Archived')
+ end
+ end
+
+ xcontext 'when product is paused' do
+ let(:product) { build(:product, status: :paused) }
+
+ it 'returns the correct status' do
+ expect(available_status(product)).to eq('Paused')
+ end
+ end
+
+ context 'when product is deleted' do
+ let(:product) { build(:product, deleted_at: Time.current) }
+
+ it 'returns the correct status' do
+ expect(available_status(product)).to eq('Deleted')
+ end
+ end
+ end
+end
diff --git a/core/app/helpers/spree/products_helper.rb b/core/app/helpers/spree/products_helper.rb
index 287cf98067..91537a3886 100644
--- a/core/app/helpers/spree/products_helper.rb
+++ b/core/app/helpers/spree/products_helper.rb
@@ -74,25 +74,6 @@ module Spree
string.slice(0..449) + '...'
end
- # will return a human readable string
- def available_status(product)
- Spree::Deprecation.warn(<<-DEPRECATION, caller)
- `Spree::ProductsHelper#available_status` method from spree/core is deprecated and will be removed.
- Please use `Spree::Admin::ProductsHelper#available_status` from spree_backend instead.
- DEPRECATION
-
- return Spree.t(:archived) if product.discontinued?
- return Spree.t(:deleted) if product.deleted?
-
- if product.available?
- Spree.t(:active)
- elsif product.make_active_at&.future?
- Spree.t(:pending_sale)
- else
- Spree.t(:draft)
- end
- end
-
def product_images(product, variants)
if product.variants_and_option_values(current_currency).any?
variants_without_master_images = variants.reject(&:is_master).map(&:images).flatten
diff --git a/core/spec/helpers/products_helper_spec.rb b/core/spec/helpers/products_helper_spec.rb
index 35d15761c6..8442a6a257 100644
--- a/core/spec/helpers/products_helper_spec.rb
+++ b/core/spec/helpers/products_helper_spec.rb
@@ -286,58 +286,5 @@ module Spree
it { is_expected.to eq("en/USD/spree/products/new/#{promotion.cache_key}/#{promotion_2.cache_key}") }
end
end
-
- context '#available_status' do
- subject(:status) { helper.available_status(product) }
-
- let(:product) { create(:product, stores: [store]) }
-
- context 'product is available' do
- it 'has available status' do
- expect(status).to eq(Spree.t(:active))
- end
- end
-
- context 'product was deleted' do
- before do
- product.delete
- end
-
- it 'has deleted status' do
- expect(status).to eq(Spree.t(:deleted))
- end
- end
-
- context 'product is discontinued' do
- before do
- product.discontinue!
- end
-
- it 'has discontinued status' do
- expect(status).to eq(Spree.t(:archived))
- end
- end
-
- context 'product will be available soon' do
- before do
- product.status = 'draft'
- product.make_active_at = 1.month.from_now
- end
-
- it 'has pending sale status' do
- expect(status).to eq(Spree.t(:pending_sale))
- end
- end
-
- context 'draft product' do
- before do
- product.status = 'draft'
- end
-
- it 'has draft status' do
- expect(status).to eq(Spree.t(:draft))
- end
- end
- end
end
end