From 451cf5b1f24334c6b6f9653d2c63f23e4d332ffd Mon Sep 17 00:00:00 2001 From: zhangyu Date: Wed, 20 Apr 2022 18:46:11 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BC=98=E5=8C=96=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/test/unit/specs/lib/bus.spec.js | 6 ++---- nezha-fronted/test/unit/specs/main.spec.js | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/nezha-fronted/test/unit/specs/lib/bus.spec.js b/nezha-fronted/test/unit/specs/lib/bus.spec.js index 36323af6d..4de511edb 100644 --- a/nezha-fronted/test/unit/specs/lib/bus.spec.js +++ b/nezha-fronted/test/unit/specs/lib/bus.spec.js @@ -3,16 +3,14 @@ // import ElementUI from 'element-ui' import bus from '@/libs/bus' +import moment from 'moment-timezone' // const localVue = createLocalVue() // localVue.use(ElementUI) describe('bus时间函数', () => { + localStorage.setItem('nz-sys-timezone', 'America/Danmarkshavn') // 测试代码可读性最好 // 分组 - it('正常替换', function () { - // console.log(bus) - expect(bus.timeFormate(1650006960000)).toBe('2022-04-15 15:16:00') - }) it('文字替换', function () { // console.log(bus) expect(bus.timeFormate('2022-04-15 15:16:00')).toBe('2022-04-15 15:16:00') diff --git a/nezha-fronted/test/unit/specs/main.spec.js b/nezha-fronted/test/unit/specs/main.spec.js index 1f4808b06..9ac86b305 100644 --- a/nezha-fronted/test/unit/specs/main.spec.js +++ b/nezha-fronted/test/unit/specs/main.spec.js @@ -1,34 +1,35 @@ import mainMixin from '@/components/common/mixin/mainMixinFun' import i18n from '@/components/common/i18n' +import moment from 'moment-timezone' describe('时间函数', () => { - localStorage.setItem('nz-sys-timezone', 'Asia/Shanghai') + localStorage.setItem('nz-sys-timezone', 'America/Danmarkshavn') it('utc时间转系统时间 返回时间戳', () => { - expect(mainMixin.methods.utcTimeToTimezone(1650006960000)).toBe(1650035760000) + expect(mainMixin.methods.utcTimeToTimezone(1650006960000)).toBe(1650006960000) }) it('utc时间转系统时间 返回时间戳', () => { - expect(mainMixin.methods.utcTimeToTimezone('2022-04-15 15:16:00')).toBe(1650035760000) + expect(mainMixin.methods.utcTimeToTimezone('2022-04-15 15:16:00')).toBe(1650006960000) }) it('utc时间转系统时间 返回时间字符串', () => { - expect(mainMixin.methods.utcTimeToTimezoneStr(1650006960000)).toBe('2022-04-15 23:16:00') + expect(mainMixin.methods.utcTimeToTimezoneStr(1650006960000)).toBe('2022-04-15 15:16:00') }) it('utc时间转系统时间 返回时间字符串', () => { - expect(mainMixin.methods.utcTimeToTimezoneStr('2022-04-15 15:16:00')).toBe('2022-04-15 23:16:00') + expect(mainMixin.methods.utcTimeToTimezoneStr('2022-04-15 15:16:00')).toBe('2022-04-15 15:16:00') }) it('utc时间转系统时间 返回时间字符串 指定时间格式', () => { expect(mainMixin.methods.utcTimeToTimezoneStr('2022-04-15 15:16:00', 'DD/MM/YYYY')).toBe('15/04/2022') }) it('系统时间转utc时间转 返回时间戳', () => { - expect(mainMixin.methods.timezoneToUtcTime(1650006960000)).toBe(1649978160000) + expect(mainMixin.methods.timezoneToUtcTime(1650006960000)).toBe(1650006960000) }) it('系统时间转utc时间转 返回时间戳', () => { - expect(mainMixin.methods.timezoneToUtcTime('2022-04-15 15:16:00')).toBe(1649978160000) + expect(mainMixin.methods.timezoneToUtcTime('2022-04-15 15:16:00')).toBe(1650006960000) }) it('系统时间转utc时间转 返回时间字符串', () => { - expect(mainMixin.methods.timezoneToUtcTimeStr(1650006960000)).toBe('2022-04-15 07:16:00') + expect(mainMixin.methods.timezoneToUtcTimeStr(1650006960000)).toBe('2022-04-15 15:16:00') }) it('系统时间转utc时间转 返回时间字符串', () => { - expect(mainMixin.methods.timezoneToUtcTimeStr('2022-04-15 15:16:00')).toBe('2022-04-15 07:16:00') + expect(mainMixin.methods.timezoneToUtcTimeStr('2022-04-15 15:16:00')).toBe('2022-04-15 15:16:00') }) it('系统时间转utc时间转 返回时间字符串 指定时间格式', () => { expect(mainMixin.methods.timezoneToUtcTimeStr('2022-04-15 15:16:00', 'DD/MM/YYYY')).toBe('15/04/2022')