test: Update calendar test

src/plugin/calendar/index.js

@@ -10,8 +10,8 @@ export default (o, c, d) => {
     sameElse: L
   }
   const proto = c.prototype
-  proto.calendar = function (referenceTime, callbacks) {
-    const format = callbacks || this.$locale().calendar || calendarFormat
+  proto.calendar = function (referenceTime, formats) {
+    const format = formats || this.$locale().calendar || calendarFormat
     const referenceStartOfDay = d(referenceTime || undefined).startOf('d')
     const diff = this.diff(referenceStartOfDay, 'd', true)
     const sameElse = 'sameElse'
@@ -25,10 +25,9 @@ export default (o, c, d) => {
     /* eslint-enable no-nested-ternary */
     const currentFormat = format[retVal] || calendarFormat[retVal]
     if (typeof currentFormat === 'function') {
-      return currentFormat(referenceStartOfDay)
+      return currentFormat.call(this, d())
     }
-    const formattedDate = this.format(currentFormat)
-    return formattedDate
+    return this.format(currentFormat)
   }
 }
 

test/plugin/calendar.test.js

@@ -104,10 +104,17 @@ it('Calls callback', () => {
 
 it('callback is a function with the scope of the current moment', () => {
   const callbacks = {
-    sameDay: jest.fn(),
-    sameElse: jest.fn()
+    sameDay: jest.fn()
   }
   expect(dayjs().calendar(null, callbacks)).toEqual(callbacks.sameDay())
+  const callbacks2 = {
+    sameDay: function cb() {
+      return this
+    }
+  }
+  const result = dayjs().calendar(null, callbacks2)
+  expect(result.format).not.toBeUndefined()
+  expect(dayjs.isDayjs(result)).toBeTruthy()
 })
 
 it('callback is a function and first argument a moment that depicts now', () => {
@@ -116,7 +123,7 @@ it('callback is a function and first argument a moment that depicts now', () =>
   }
   const now = dayjs()
   dayjs(now).calendar(now, callbacks)
-  expect(callbacks.sameDay).toBeCalledWith(now.startOf('d'))
+  expect(callbacks.sameDay).toBeCalledWith(now)
 })
 
 it('set global calendar in locale file', () => {