From dee3cd3da759b3026efb8dcaa81dba9b6f543e63 Mon Sep 17 00:00:00 2001 From: JakeBinney <126349119+JakeBinney@users.noreply.github.com> Date: Sun, 9 Apr 2023 01:19:51 -0600 Subject: [PATCH] Fixed clock module sunrise/sunset timezone bug (#3070) Updated sunrise/sunset times to display user-requested timezone rather than system timezone. Note: rebase of #3069 against develop rather than master Co-authored-by: Veeck --- modules/default/utils.js | 2 +- tests/unit/modules/default/utils_spec.js | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/modules/default/utils.js b/modules/default/utils.js index 16c8f887..8c705c76 100644 --- a/modules/default/utils.js +++ b/modules/default/utils.js @@ -152,7 +152,7 @@ const formatTime = (config, time) => { let date = moment(time); if (config.timezone) { - date = moment.tz(config.timezone); + date = date.tz(config.timezone); } if (config.timeFormat !== 24) { diff --git a/tests/unit/modules/default/utils_spec.js b/tests/unit/modules/default/utils_spec.js index 768c4771..34a31645 100644 --- a/tests/unit/modules/default/utils_spec.js +++ b/tests/unit/modules/default/utils_spec.js @@ -114,24 +114,11 @@ describe("Default modules utils tests", () => { describe("formatTime", () => { const time = new Date(); - beforeAll(() => { - jest.useFakeTimers(); - }); - beforeEach(async () => { - jest.setSystemTime(new Date("2023-01-01 13:13")); - }); - - afterEach(async () => { - jest.setSystemTime(new Date()); - }); - - afterAll(() => { - jest.useRealTimers(); + time.setHours(13, 13); }); it("should convert correctly according to the config", () => { - time.setHours(13, 13); expect( formatTime( {