From d667ab78dd1891b6cb5543977f29482b90349631 Mon Sep 17 00:00:00 2001 From: Asanda Date: Tue, 29 Sep 2026 22:54:42 +0200 Subject: [PATCH] time converter exercise --- format-clock-edge-cases/timeConverter.js | 15 ++++-- format-clock-edge-cases/timeConverter.test.js | 54 +++++++++++++++++-- 2 files changed, 61 insertions(+), 8 deletions(-) diff --git a/format-clock-edge-cases/timeConverter.js b/format-clock-edge-cases/timeConverter.js index 310c07bd9..ec732ff24 100644 --- a/format-clock-edge-cases/timeConverter.js +++ b/format-clock-edge-cases/timeConverter.js @@ -1,11 +1,20 @@ function formatAs12HourClock(time) { - const hours = Number(time.slice(0, 2)); + const minutes = time.slice(3); + + if (hours === 0) { + return `12:${minutes} am`; + } + + if (hours === 12) { + return `12:${minutes} pm`; + } if (hours > 12) { - return `${hours - 12}:00 pm`; + return `${hours - 12}:${minutes} pm`; } + return `${time} am`; } -export {formatAs12HourClock}; +export { formatAs12HourClock }; diff --git a/format-clock-edge-cases/timeConverter.test.js b/format-clock-edge-cases/timeConverter.test.js index 88f2af094..ed2c72865 100644 --- a/format-clock-edge-cases/timeConverter.test.js +++ b/format-clock-edge-cases/timeConverter.test.js @@ -1,11 +1,55 @@ -import {formatAs12HourClock} from "./timeConverter.js"; +import { formatAs12HourClock } from "./timeConverter.js"; import assert from "node:assert"; import test from "node:test"; -test("correctly convert time after 12:00", function(){ - assert.equal(formatAs12HourClock("23:00"), "11:00 pm"); +test("correctly convert time after 12:00", function () { + assert.equal(formatAs12HourClock("23:00"), "11:00 pm"); }); -test("can correctly convert morning time", function() { - assert.equal(formatAs12HourClock("08:00"), "08:00 am"); +test("can correctly convert morning time", function () { + assert.equal(formatAs12HourClock("08:00"), "08:00 am"); }); + +test("correctly convert time after 12:00", function () { + assert.equal(formatAs12HourClock("23:00"), "11:00 pm"); +}); + +test("can correctly convert morning time", function () { + assert.equal(formatAs12HourClock("08:00"), "08:00 am"); +}); + +test("can correctly convert midnight", function () { + assert.equal(formatAs12HourClock("00:00"), "12:00 am"); +}); + +test("can correctly convert midday", function () { + assert.equal(formatAs12HourClock("12:00"), "12:00 pm"); +}); + +test("can correctly convert 12:30 pm", function () { + assert.equal(formatAs12HourClock("12:30"), "12:30 pm"); +}); + +test("preserves minutes in the morning", function () { + assert.equal(formatAs12HourClock("09:45"), "09:45 am"); +}); + +test("preserves minutes in the afternoon", function () { + assert.equal(formatAs12HourClock("13:45"), "1:45 pm"); +}); + +test("correctly converts 1:00 pm", function () { + assert.equal(formatAs12HourClock("13:00"), "1:00 pm"); +}); + +test("correctly converts 6:30 pm", function () { + assert.equal(formatAs12HourClock("18:30"), "6:30 pm"); +}); + +test("correctly converts 11:59 pm", function () { + assert.equal(formatAs12HourClock("23:59"), "11:59 pm"); +}); + +test("correctly converts 11:59 am", function () { + assert.equal(formatAs12HourClock("11:59"), "11:59 am"); +}); \ No newline at end of file