From 04eca9591bb4d0604e732a80ec979a76d36dd26f Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 18 Jul 2014 11:27:09 +1000 Subject: [PATCH] Derive unitScales from unitNames --- .../admin/services/variant_unit_manager.js.coffee | 5 +---- .../admin/services/variant_unit_manager_spec.js.coffee | 7 +++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/admin/services/variant_unit_manager.js.coffee b/app/assets/javascripts/admin/services/variant_unit_manager.js.coffee index dbdac44808..eec6130bad 100644 --- a/app/assets/javascripts/admin/services/variant_unit_manager.js.coffee +++ b/app/assets/javascripts/admin/services/variant_unit_manager.js.coffee @@ -35,7 +35,4 @@ angular.module("admin.products").factory "VariantUnitManager", -> @unitNames[unitType][scale] @unitScales: (unitType) -> - unitScales = - 'weight': [1.0, 1000.0, 1000000.0] - 'volume': [0.001, 1.0, 1000.0] - unitScales[unitType] + (parseFloat(scale) for scale in Object.keys(@unitNames[unitType])).sort() 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 7f9ced4be0..21830cae65 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 @@ -26,3 +26,10 @@ describe "VariantUnitManager", -> expect(VariantUnitManager.getUnitName(0.001, "volume")).toEqual "mL" expect(VariantUnitManager.getUnitName(1, "volume")).toEqual "L" expect(VariantUnitManager.getUnitName(1000, "volume")).toEqual "kL" + + describe "unitScales", -> + it "returns a set of scales for unit type weight", -> + expect(VariantUnitManager.unitScales('weight')).toEqual [1.0, 1000.0, 1000000.0] + + it "returns a set of scales for unit type volume", -> + expect(VariantUnitManager.unitScales('volume')).toEqual [0.001, 1.0, 1000.0]