From 06f8bc5a2ee9e4025ff9b09eac3f9fb5bb7eaa9e Mon Sep 17 00:00:00 2001 From: zhenyuWang <13641039885@163.com> Date: Sat, 16 Nov 2024 09:48:36 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"test(global=20events):=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=B5=8B=E8=AF=95=E4=BE=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c9c07d3bbfb879dc84e72b3c886a0f9ee51d7294. --- .../global-events/global-events.test.js | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pages/component/global-events/global-events.test.js b/pages/component/global-events/global-events.test.js index 5d8bd870..22e7d406 100644 --- a/pages/component/global-events/global-events.test.js +++ b/pages/component/global-events/global-events.test.js @@ -39,8 +39,8 @@ describe('event trigger', () => { screenY: 101 }, ], }) - const touchStartTouchTargetIdentifier = '1' - const touchStartTouchTargetValue = '101' + const touchStartTouchTargetIdentifier = isAndroid ? '1.0' : '1' + const touchStartTouchTargetValue = isAndroid ? '101.0' : '101' const touchStartTouchIdentifier = await page.$('#touch-start-touch-identifier') expect(await touchStartTouchIdentifier.text()).toBe(touchStartTouchTargetIdentifier) const touchStartTouchPageX = await page.$('#touch-start-touch-page-x') @@ -92,8 +92,8 @@ describe('event trigger', () => { }, ], }) - const touchMoveTouchTargetIdentifier = '1' - const touchMoveTouchTargetValue = '102' + const touchMoveTouchTargetIdentifier = isAndroid ? '1.0' : '1' + const touchMoveTouchTargetValue = isAndroid ? '102.0' : '102' const touchMoveTouchIdentifier = await page.$('#touch-move-touch-identifier') expect(await touchMoveTouchIdentifier.text()).toBe(touchMoveTouchTargetIdentifier) const touchMoveTouchPageX = await page.$('#touch-move-touch-page-x') @@ -143,8 +143,8 @@ describe('event trigger', () => { screenY: 103 }, ], }) - const touchEndTouchTargetIdentifier = '1' - const touchEndTouchTargetValue = '103' + const touchEndTouchTargetIdentifier = isAndroid ? '1.0' : '1' + const touchEndTouchTargetValue = isAndroid ? '103.0' : '103' const touchEndTouchIdentifier = await page.$('#touch-end-touch-identifier') expect(await touchEndTouchIdentifier.text()).toBe(touchEndTouchTargetIdentifier) const touchEndTouchPageX = await page.$('#touch-end-touch-page-x') @@ -179,8 +179,8 @@ describe('event trigger', () => { it('click', async () => { const el = await page.$('#longpress-target') await el.tap() - const targetX = '0' - const targetY = '0' + const targetX = isAndroid ? '0.0' : '0' + const targetY = isAndroid ? '0.0' : '0' const tapEventX = await page.$('#tap-event-x') expect(await tapEventX.text()).toBe(targetX) const tapEventY = await page.$('#tap-event-y') @@ -195,8 +195,8 @@ describe('event trigger', () => { if (!process.env.UNI_AUTOMATOR_APP_WEBVIEW) { const el = await page.$('#longpress-target') await el.longpress() - const longPressTouchTargetIdentifier = '1' - const longPressTouchTargetValue = '0' + const longPressTouchTargetIdentifier = isAndroid ? '1.0' : '1' + const longPressTouchTargetValue = isAndroid ? '0.0' : '0' const longPressTouchIdentifier = await page.$('#long-press-touch-identifier') expect(await longPressTouchIdentifier.text()).toBe(longPressTouchTargetIdentifier) const longPressTouchPageX = await page.$('#long-press-touch-page-x') @@ -319,3 +319,4 @@ describe('event trigger', () => { } }) }) + -- GitLab