From 3922ffa6a99081ed5c8887ed6df49609dc70179b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Fri, 3 Dec 2021 11:43:59 +0100 Subject: [PATCH] Handle imperial units for VariantUnitManager --- .../unit/admin/services/variant_unit_manager_spec.js.coffee | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spec/javascripts/unit/admin/services/variant_unit_manager_spec.js.coffee b/spec/javascripts/unit/admin/services/variant_unit_manager_spec.js.coffee index 5e96a68766..eb125df8d9 100644 --- a/spec/javascripts/unit/admin/services/variant_unit_manager_spec.js.coffee +++ b/spec/javascripts/unit/admin/services/variant_unit_manager_spec.js.coffee @@ -4,7 +4,7 @@ describe "VariantUnitManager", -> beforeEach -> module "admin.products" module ($provide)-> - $provide.value "availableUnits", "g,kg,T,mL,L,kL" + $provide.value "availableUnits", "g,kg,T,mL,L,kL,lb,oz" null beforeEach inject (_VariantUnitManager_) -> @@ -29,6 +29,8 @@ describe "VariantUnitManager", -> expect(VariantUnitManager.getUnitName(0.001, "volume")).toEqual "mL" expect(VariantUnitManager.getUnitName(1, "volume")).toEqual "L" expect(VariantUnitManager.getUnitName(1000, "volume")).toEqual "kL" + expect(VariantUnitManager.getUnitName(453.6, "weight")).toEqual "lb" + expect(VariantUnitManager.getUnitName(28.35, "weight")).toEqual "oz" describe "unitScales", -> it "returns a sorted set of scales for unit type weight", -> @@ -46,6 +48,8 @@ describe "VariantUnitManager", -> it "returns an array of options", -> expect(VariantUnitManager.variantUnitOptions()).toEqual [ ["Weight (g)", "weight_1"], + ["Weight (oz)", "weight_28.35" ], + ["Weight (lb)", "weight_453.6" ] ["Weight (kg)", "weight_1000"], ["Weight (T)", "weight_1000000"], ["Volume (mL)", "volume_0.001"],