fix: timezome update logic based on timezone availability in object

iamkun · Jan 17, 2025 · 6c9047e · 6c9047e
1 parent c1d37ff
commit 6c9047e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/plugin/timezone/index.js b/src/plugin/timezone/index.js
@@ -123,7 +123,8 @@ export default (o, c, d) => {
 
   const oldStartOf = proto.startOf
   proto.startOf = function (units, startOf) {
-    if (!this.$x || !this.$x.$timezone) {
+    if (this.$x && this.$x.$timezone) {
+      // timezone information is kept in $x: { timezone: "utc"}
       return oldStartOf.call(this, units, startOf)
     }
 

diff --git a/test/timezone.test.js b/test/timezone.test.js
@@ -45,14 +45,14 @@ it('Diff (DST)', () => {
 it('UTC add day in DST', () => {
   const testDate = '2019-03-10'
   const dayTest = dayjs(testDate)
-    .utc()
+    .tz('utc')
     .startOf('day')
   const momentTest = moment(testDate)
     .utc()
     .startOf('day')
-  expect(dayTest.add(1, 'day').format())
+  expect(dayTest.add(1, 'day').format('YYYY-MM-DDTHH:mm:ss[Z]'))
     .toBe(momentTest.clone().add(1, 'day').format())
-  expect(dayTest.add(2, 'day').format())
+  expect(dayTest.add(2, 'day').format('YYYY-MM-DDTHH:mm:ss[Z]'))
     .toBe(momentTest.clone().add(2, 'day').format())
 })