From f2a2ea6dc2948c6492ac51422fce3939c95a6272 Mon Sep 17 00:00:00 2001 From: iamkun Date: Wed, 26 May 2021 14:37:03 +0800 Subject: [PATCH] test: add utc plugin test --- src/constant.js | 4 ---- src/plugin/utc/index.js | 5 ++++- test/plugin/utc.test.js | 10 ++++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/constant.js b/src/constant.js index f6af3efe2..6be602e2c 100644 --- a/src/constant.js +++ b/src/constant.js @@ -28,7 +28,3 @@ export const INVALID_DATE_STRING = 'Invalid Date' // regex export const REGEX_PARSE = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[^0-9]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/ export const REGEX_FORMAT = /\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g - -// used by plugins/utc -export const REGEX_VALID_OFFSET_FORMAT = /[+-]\d\d(?::?\d\d)?/g -export const REGEX_OFFSET_HOURS_MINUTES_FORMAT = /([+-]|\d\d)/g diff --git a/src/plugin/utc/index.js b/src/plugin/utc/index.js index 7e842b3b0..10ff1ec9a 100644 --- a/src/plugin/utc/index.js +++ b/src/plugin/utc/index.js @@ -1,4 +1,7 @@ -import { MILLISECONDS_A_MINUTE, MIN, REGEX_VALID_OFFSET_FORMAT, REGEX_OFFSET_HOURS_MINUTES_FORMAT } from '../../constant' +import { MILLISECONDS_A_MINUTE, MIN } from '../../constant' + +const REGEX_VALID_OFFSET_FORMAT = /[+-]\d\d(?::?\d\d)?/g +const REGEX_OFFSET_HOURS_MINUTES_FORMAT = /([+-]|\d\d)/g function offsetFromString(value = '') { const offset = value.match(REGEX_VALID_OFFSET_FORMAT) diff --git a/test/plugin/utc.test.js b/test/plugin/utc.test.js index 2dd5c0c35..b8fc92591 100644 --- a/test/plugin/utc.test.js +++ b/test/plugin/utc.test.js @@ -291,6 +291,16 @@ describe('UTC Offset', () => { expect(daysJS.utcOffset()).toEqual(0) expect(daysJS.utcOffset()).toEqual(momentJS.utcOffset()) }) + + it('get utc offset with an invalid string value, value: 0', () => { + const time = '2021-02-28 19:40:10' + const daysJS = dayjs(time, { utc: true }).utc(true).utcOffset('+0000') + const momentJS = moment(time).utc(true).utcOffset('+0000') + + expect(daysJS.toISOString()).toEqual(momentJS.toISOString()) + expect(daysJS.utcOffset()).toEqual(0) + expect(daysJS.utcOffset()).toEqual(momentJS.utcOffset()) + }) }) describe('Diff', () => {