From 2a6760be8eb431fada70c4193aba28f2dae81502 Mon Sep 17 00:00:00 2001 From: Anne_LXM Date: Tue, 20 Aug 2024 20:10:28 +0800 Subject: [PATCH] =?UTF-8?q?test(scroll-view.test.js/list-view.test.js):=20?= =?UTF-8?q?issues2420=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=96=B0=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/component/list-view/list-view.test.js | 23 ++++----- pages/component/list-view/list-view.uvue | 7 --- .../component/scroll-view/scroll-view.test.js | 49 +++++++++---------- pages/component/scroll-view/scroll-view.uvue | 7 --- 4 files changed, 32 insertions(+), 54 deletions(-) diff --git a/pages/component/list-view/list-view.test.js b/pages/component/list-view/list-view.test.js index 2dd804b2..cd66a837 100644 --- a/pages/component/list-view/list-view.test.js +++ b/pages/component/list-view/list-view.test.js @@ -38,18 +38,15 @@ describe('component-native-list-view', () => { await page.waitFor(600) await page.callMethod('confirm_scroll_top_input', 300) await page.waitFor(600) - // 在web端scroll事件event参数中detail类型报错，先忽略测试 - if(!process.env.UNI_UTS_PLATFORM.startsWith('web')){ - const scrollDetail = await page.data('scrollDetailTest') - console.log('scrollDetailTest:', scrollDetail) - expect(scrollDetail.scrollLeft).toBe(0) - // scrollTop和deltaY 在安卓端差异 299.8095 - expect([300, 299.8095]).toContain(scrollDetail.scrollTop); - expect(scrollDetail.scrollHeight).toBeGreaterThan(0) - expect(scrollDetail.scrollWidth).toBeGreaterThan(0) - expect(scrollDetail.deltaX).toBe(0) - expect([300, 299.8095]).toContain(scrollDetail.deltaY); - } + const scrollDetail = await page.data('scrollDetailTest') + // console.log('scrollDetailTest:', scrollDetail) + expect(scrollDetail.scrollLeft).toBe(0) + // scrollTop和deltaY 在安卓端差异 299.8095 + expect([300, 299.8095]).toContain(scrollDetail.scrollTop); + expect(scrollDetail.scrollHeight).toBeGreaterThan(0) + expect(scrollDetail.scrollWidth).toBeGreaterThan(0) + expect(scrollDetail.deltaX).toBe(0) + expect([300, 299.8095]).toContain(scrollDetail.deltaY); expect(await page.data('isScrollTest')).toBe('scroll:Success') }) @@ -84,7 +81,7 @@ describe('component-native-list-view', () => { }) await page.waitFor(600) const endDetail = await page.data('scrollEndDetailTest') - console.log('scrollEndDetailTest:', endDetail) + // console.log('scrollEndDetailTest:', endDetail) expect(endDetail.deltaY).toBe(0) expect(endDetail.deltaX).toBe(0) expect(endDetail.scrollLeft).toBe(0) diff --git a/pages/component/list-view/list-view.uvue b/pages/component/list-view/list-view.uvue index aad832e4..09b563b6 100644 --- a/pages/component/list-view/list-view.uvue +++ b/pages/component/list-view/list-view.uvue @@ -34,11 +34,8 @@ isScrollTest:'', isScrolltolowerTest:'', isScrolltoupperTest:'', - // 在web端scroll事件event参数中detail类型报错，先条件编译处理 - // #ifndef WEB scrollDetailTest:null as UniScrollEventDetail|null, scrollEndDetailTest:null as UniScrollEventDetail|null, - // #endif } }, onLoad() { @@ -103,9 +100,7 @@ }, list_view_scroll(e:UniScrollEvent) { console.log("滚动时触发，event.detail = {scrollLeft, scrollTop, scrollHeight, scrollWidth, deltaX, deltaY}") - // #ifndef WEB this.scrollDetailTest = e.detail - // #endif this.checkEventTest({ type:e.type, target:e.target, @@ -114,9 +109,7 @@ }, list_view_scrollend(e:UniScrollEvent){ console.log("滚动结束时触发",e.detail) - // #ifndef WEB this.scrollEndDetailTest = e.detail - // #endif this.checkEventTest({ type:e.type, target:e.target, diff --git a/pages/component/scroll-view/scroll-view.test.js b/pages/component/scroll-view/scroll-view.test.js index 17fe1ee1..130281b4 100644 --- a/pages/component/scroll-view/scroll-view.test.js +++ b/pages/component/scroll-view/scroll-view.test.js @@ -20,19 +20,16 @@ describe('component-native-scroll-view', () => { // 纵向滚动 await page.setData({scrollTop: 100}) await page.waitFor(1000) - // bug:在web端scroll事件event参数中detail类型报错 - if(!process.env.UNI_UTS_PLATFORM.startsWith('web')){ - // 设置top 是否触发scroll 事件 - const topScrollDetail = await page.data('scrollDetailTest') - console.log('topScrollDetail:', topScrollDetail) - expect(topScrollDetail.scrollLeft).toBe(0) - // Android 差异scrollTop：99.809525 - expect([100, 99.809525]).toContain(topScrollDetail.scrollTop); - expect(topScrollDetail.scrollHeight).toBeGreaterThan(0) - expect(topScrollDetail.scrollWidth).toBeGreaterThan(0) - expect(topScrollDetail.deltaX).toBe(0) - expect(topScrollDetail.deltaY).not.toBe(0) - } + // 设置top 是否触发scroll 事件 + const topScrollDetail = await page.data('scrollDetailTest') + // console.log('topScrollDetail:', topScrollDetail) + expect(topScrollDetail.scrollLeft).toBe(0) + // Android 差异scrollTop：99.809525 + expect([100, 99.809525]).toContain(topScrollDetail.scrollTop); + expect(topScrollDetail.scrollHeight).toBeGreaterThan(0) + expect(topScrollDetail.scrollWidth).toBeGreaterThan(0) + expect(topScrollDetail.deltaX).toBe(0) + expect(topScrollDetail.deltaY).not.toBe(0) expect(await page.data('isScrollTest')).toBe('scroll:Success') }) @@ -40,19 +37,17 @@ describe('component-native-scroll-view', () => { // 横向滚动 await page.setData({scrollLeft:220}) await page.waitFor(600) - if(!process.env.UNI_UTS_PLATFORM.startsWith('web')){ - //设置left 是否触发scroll 事件 - const leftScrollDetail = await page.data('scrollDetailTest') - console.log('leftScrollDetail:', leftScrollDetail) - // Android 差异scrollLeft：219.80952 - expect([220, 219.80952]).toContain(leftScrollDetail.scrollLeft); - expect(leftScrollDetail.scrollTop).toBe(0) - expect(leftScrollDetail.scrollHeight).toBeGreaterThan(0) - expect(leftScrollDetail.scrollWidth).toBeGreaterThan(0) - // 在安卓差异 -99.809525 - expect([-100, -99.809525]).toContain(leftScrollDetail.deltaX); - expect(leftScrollDetail.deltaY).toBe(0) - } + //设置left 是否触发scroll 事件 + const leftScrollDetail = await page.data('scrollDetailTest') + // console.log('leftScrollDetail:', leftScrollDetail) + // Android 差异scrollLeft：219.80952 + expect([220, 219.80952]).toContain(leftScrollDetail.scrollLeft); + expect(leftScrollDetail.scrollTop).toBe(0) + expect(leftScrollDetail.scrollHeight).toBeGreaterThan(0) + expect(leftScrollDetail.scrollWidth).toBeGreaterThan(0) + // 在安卓差异 -99.809525 + expect([-100, -99.809525]).toContain(leftScrollDetail.deltaX); + expect(leftScrollDetail.deltaY).toBe(0) expect(await page.data('isScrollTest')).toBe('scroll:Success') }) @@ -74,7 +69,7 @@ describe('component-native-scroll-view', () => { if(!process.env.UNI_UTS_PLATFORM.startsWith('web')){ it('Event scrollend-滚动结束时触发仅App端支持',async()=>{ const endDetail = await page.data('scrollEndDetailTest') - console.log('scrollEndDetailTest:', endDetail) + // console.log('scrollEndDetailTest:', endDetail) expect(endDetail.scrollLeft).toBe(0) expect(endDetail.scrollTop).toBe(0) expect(endDetail.deltaY).toBe(0) diff --git a/pages/component/scroll-view/scroll-view.uvue b/pages/component/scroll-view/scroll-view.uvue index 66810f21..7e8ffc09 100644 --- a/pages/component/scroll-view/scroll-view.uvue +++ b/pages/component/scroll-view/scroll-view.uvue @@ -80,11 +80,8 @@ isScrollTest:'', isScrolltolowerTest:'', isScrolltoupperTest:'', - // 在web端scroll事件event参数中detail类型报错，先条件编译处理 - // #ifndef WEB scrollDetailTest:null as UniScrollEventDetail|null, scrollEndDetailTest:null as UniScrollEventDetail|null, - // #endif } }, methods: { @@ -107,9 +104,7 @@ } as ScrollEventTest,'scrolltolower') }, scroll: function (e : UniScrollEvent) { - // #ifndef WEB this.scrollDetailTest = e.detail - // #endif this.checkEventTest({ type:e.type, target:e.target, @@ -119,9 +114,7 @@ }, end: function (e : UniScrollEvent){ console.log('滚动结束时触发',e) - // #ifndef WEB this.scrollEndDetailTest = e.detail - // #endif this.checkEventTest({ type:e.type, target:e.target, -- GitLab