From be3b024b0bcaeac2cfec8b3412fbdc99aeec907c Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Mon, 17 Sep 2018 08:32:52 -0700 Subject: [PATCH] Fix regression in getTimeStr When we switched getTimeObj to return strings, our sketchy zero check started to fail. Luckily our tests caught it! --- js/utils.test.js | 8 ++++---- js/utils.ts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/js/utils.test.js b/js/utils.test.js index 3f55b2ce..c8d3f113 100644 --- a/js/utils.test.js +++ b/js/utils.test.js @@ -21,10 +21,10 @@ describe("getTimeObj", () => { it("expresses seconds as an object", () => { const actual = getTimeObj(1234); const expected = { - minutesFirstDigit: 2, - minutesSecondDigit: 0, - secondsFirstDigit: 3, - secondsSecondDigit: 4 + minutesFirstDigit: "2", + minutesSecondDigit: "0", + secondsFirstDigit: "3", + secondsSecondDigit: "4" }; expect(actual).toEqual(expected); }); diff --git a/js/utils.ts b/js/utils.ts index 328cec0b..f64b6933 100644 --- a/js/utils.ts +++ b/js/utils.ts @@ -51,7 +51,7 @@ export const getTimeObj = (time: number | null): Time => { }; }; -export const getTimeStr = (time: number, truncate = true): string => { +export const getTimeStr = (time: number, truncate: boolean = true): string => { if (time == null) { return ""; } @@ -63,7 +63,7 @@ export const getTimeStr = (time: number, truncate = true): string => { } = getTimeObj(time); return [ - truncate ? minutesFirstDigit || "" : minutesFirstDigit, + truncate && minutesFirstDigit === "0" ? "" : minutesFirstDigit, minutesSecondDigit, ":", secondsFirstDigit,