raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-27 06:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Gracefully handle empty string

Browse Source
This commit is contained in:
David Cook
2024-07-18 11:40:07 +10:00
parent 4925e2088d
commit 918d4401ff
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/services/weights_and_measures.rb
View File

@@ -15,9 +15,11 @@ class WeightsAndMeasures
def system
return "custom" unless scales = scales_for_variant_unit(ignore_available_units: true)
return "custom" unless product_scale = @variant.product.variant_unit_scale
scales[product_scale.to_f]['system']
product_scale = @variant.product.variant_unit_scale&.to_f
return "custom" unless product_scale.present? && product_scale.positive?
scales[product_scale]['system']
end
# @returns enumerable with label and value for select

2
spec/services/weights_and_measures_spec.rb
View File

@@ -91,7 +91,7 @@ RSpec.describe WeightsAndMeasures do
expect(subject.system).to eq("custom")
end
pending "when unit is valid, but scale is 0" do
it "when unit is valid, but scale is 0" do
allow(product).to receive(:variant_unit) { "weight" }
allow(product).to receive(:variant_unit_scale) { 0.0 }
expect(subject.system).to eq("custom")