Fallback to default bytes when not provided

Fix #558
BenjaminVanRyseghem · Jul 8, 2020 · 873d350 · 873d350 · seedy · Jul 31, 2020
1 parent 4c27cab
commit 873d350
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/src/formatting.js b/src/formatting.js
@@ -206,9 +206,9 @@ function formatByte(instance, providedFormat, state, numbro) {
     const { binarySuffixes: localBinarySuffixes, decimalSuffixes: localDecimalSuffixes } = state.currentBytes();
 
     const localBytes = {
-        general: { scale: 1024, suffixes: localDecimalSuffixes, marker: "bd" },
-        binary: { scale: 1024, suffixes: localBinarySuffixes, marker: "b" },
-        decimal: { scale: 1000, suffixes: localDecimalSuffixes, marker: "d" }
+        general: { scale: 1024, suffixes: localDecimalSuffixes || decimalSuffixes, marker: "bd" },
+        binary: { scale: 1024, suffixes: localBinarySuffixes || binarySuffixes, marker: "b" },
+        decimal: { scale: 1000, suffixes: localDecimalSuffixes || decimalSuffixes, marker: "d" }
     };
     let baseInfo = localBytes[base];
 

diff --git a/src/globalState.js b/src/globalState.js
@@ -60,7 +60,7 @@ state.currentLanguage = () => currentLanguageTag;
  *
  * @return {{}}
  */
-state.currentBytes = () => currentLanguageData().bytes;
+state.currentBytes = () => currentLanguageData().bytes || {};
 
 /**
  * Return the current language currency data

diff --git a/tests/src/globalState-tests.js b/tests/src/globalState-tests.js
@@ -166,16 +166,29 @@ describe("globalState-tests", () => {
     describe("currentByteDefaults", () => {
         let languages = undefined;
         let revert = undefined;
+        let currentLanguageData = undefined;
 
         beforeEach(() => {
             languages = {"en-US": Object.assign({}, enUS)};
-            revert = globalState.__set__({languages});
+            currentLanguageData = jasmine.createSpy("currentLanguageData");
+            let realFn = globalState.__get__("currentLanguageData");
+            currentLanguageData.and.callFake(realFn);
+            revert = globalState.__set__({
+                languages,
+                currentLanguageData
+            });
         });
 
         afterEach(() => {
             revert();
         });
 
+        it("returns empty bytes if not provided by the language", () => {
+            currentLanguageData.and.returnValue({});
+            let result = globalState.currentBytes();
+            expect(result).toEqual({});
+        });
+
         it("returns the byte defaults for the current language", () => {
             let byteFormat = jasmine.createSpy("byteFormat");
             languages["en-US"].byteFormat = byteFormat;