diff --git a/pages/component/list-view/list-view.test.js b/pages/component/list-view/list-view.test.js index 42f29be5b8506d44deb40b8aed235280b9afcdd4..28c60cb72e73b670b85b170cb45eaac0aa2f0795 100644 --- a/pages/component/list-view/list-view.test.js +++ b/pages/component/list-view/list-view.test.js @@ -51,13 +51,15 @@ describe('component-native-list-view', () => { 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); + // scrollTop和deltaY 在安卓端差异 299.8095 + expect(scrollDetail.scrollTop).toBeGreaterThan(299.5) + //expect([300, 299.8095]).toContain(scrollDetail.scrollTop); expect(scrollDetail.scrollHeight).toBeGreaterThan(0) expect(scrollDetail.scrollWidth).toBeGreaterThan(0) expect(scrollDetail.deltaX).toBe(0) - //此处可判断安卓issues:9121的问题 - expect([300.1905, 300, 299.8095]).toContain(scrollDetail.deltaY); + //此处可判断安卓issues:9121的问题 + expect(scrollDetail.deltaY).toBeGreaterThan(299.5) + //expect([300.1905, 300, 299.8095]).toContain(scrollDetail.deltaY); expect(await page.data('isScrollTest')).toBe('scroll:Success') }) diff --git a/pages/component/scroll-view/scroll-view.test.js b/pages/component/scroll-view/scroll-view.test.js index a7b90d21903d65d54d23d2047d8542528e16d047..a7b14bc372b6ac587d1850da5d8bc7a854bb5fe3 100644 --- a/pages/component/scroll-view/scroll-view.test.js +++ b/pages/component/scroll-view/scroll-view.test.js @@ -19,8 +19,9 @@ describe('component-native-scroll-view', () => { 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); + // Android 差异scrollTop:99.809525 + expect(topScrollDetail.scrollTop).toBeGreaterThan(99.5) + //expect([100, 99.809525]).toContain(topScrollDetail.scrollTop); expect(topScrollDetail.scrollHeight).toBeGreaterThan(0) expect(topScrollDetail.scrollWidth).toBeGreaterThan(0) expect(topScrollDetail.deltaX).toBe(0) @@ -35,13 +36,15 @@ describe('component-native-scroll-view', () => { //设置left 是否触发scroll 事件 const leftScrollDetail = await page.data('scrollDetailTest') console.log('leftScrollDetail:', leftScrollDetail) - // Android 差异scrollLeft:219.80952 - expect([220, 219.80952]).toContain(leftScrollDetail.scrollLeft); + // Android 差异scrollLeft:219.80952 + expect(leftScrollDetail.scrollLeft).toBeGreaterThan(219.5) + //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); + // 在安卓差异 -99.809525 + expect(leftScrollDetail.deltaX).toBeLessThan(-99.5) + //expect([-100, -99.809525]).toContain(leftScrollDetail.deltaX); expect(leftScrollDetail.deltaY).toBe(0) expect(await page.data('isScrollTest')).toBe('scroll:Success') }) diff --git a/pages/component/waterflow/waterflow.test.js b/pages/component/waterflow/waterflow.test.js index 432f4442d7b3a6a74bf98443956a4bcb4e4fd49a..7bea611d08129473d860aebbb4d0ab51b4dd6ffa 100644 --- a/pages/component/waterflow/waterflow.test.js +++ b/pages/component/waterflow/waterflow.test.js @@ -32,13 +32,15 @@ describe('component-native-waterflow', () => { 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); + // scrollTop和deltaY 在安卓端差异 299.8095 + expect(scrollDetail.scrollTop).toBeGreaterThan(299.5) + //expect([300, 299.8095]).toContain(scrollDetail.scrollTop); expect(scrollDetail.scrollHeight).toBeGreaterThan(0) expect(scrollDetail.scrollWidth).toBeGreaterThan(0) expect(scrollDetail.deltaX).toBe(0) - //此处可判断安卓issues:9121的问题 - expect([300.1905, 300, 299.8095]).toContain(scrollDetail.deltaY); + //此处可判断安卓issues:9121的问题 + expect(scrollDetail.deltaY).toBeGreaterThan(299.5) + //expect([300.1905, 300, 299.8095]).toContain(scrollDetail.deltaY); expect(await page.data('isScrollTest')).toBe('scroll:Success') })