raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12940 from dacook/bug-12939

Browse Source 
Bug 12939
This commit is contained in:
Maikel
2024-10-24 10:30:37 +11:00
committed by GitHub
parent a123369f8d 45ca2961ec
commit 762e6ec568
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/variant_units/option_value_namer.rb
View File

@@ -41,7 +41,9 @@ module VariantUnits
value, unit_name = option_value_value_unit_scaled
else
value = @nameable.unit_value
unit_name = pluralize(@nameable.variant_unit_name, value)
unit_name = @nameable.variant_unit_name
unit_name = pluralize(unit_name, value) if unit_name.present?
end
value = value.to_i if value == value.to_i

8
spec/services/variant_units/option_value_namer_spec.rb
View File

@@ -131,6 +131,14 @@ module VariantUnits
end
end
it "don't crash when variant_unit_name is nil" do
v = instance_double(Spree::Variant, variant_unit: 'items', variant_unit_scale: nil,
variant_unit_name: nil, unit_value: 100)
option_value_namer = OptionValueNamer.new v
expect(option_value_namer.__send__(:option_value_value_unit)).to eq [100, nil]
end
it "generates singular values for item units when value is 1" do
v = instance_double(Spree::Variant, variant_unit: 'items', variant_unit_scale: nil,
variant_unit_name: 'packet', unit_value: 1)