test(global-events): 优化测试例

pages/component/global-events/global-events.test.js

@@ -41,7 +41,7 @@ describe('event trigger', () => {
           screenX: 101,
           screenY: 101
         }, ],
-      })
+      })
       await page.waitFor(100)
       const touchStartTouchTargetIdentifier = '1'
       const touchStartTouchTargetValue = '101'
@@ -94,7 +94,7 @@ describe('event trigger', () => {
           screenX: 102,
           screenY: 102
         }, ],
-      })
+      })
       await page.waitFor(100)
 
       const touchMoveTouchTargetIdentifier = '1'
@@ -147,7 +147,7 @@ describe('event trigger', () => {
           screenX: 103,
           screenY: 103
         }, ],
-      })
+      })
       await page.waitFor(100)
       const touchEndTouchTargetIdentifier = '1'
       const touchEndTouchTargetValue = '103'
@@ -182,21 +182,21 @@ describe('event trigger', () => {
     }
   })
 
-  it('click', async () => {
-    if (isMP) {
-      page = await program.navigateTo(PAGE_PATH)
-      await page.waitFor('view')
-      const el = await page.$('#longpress-target')
-      await el.tap()
+  it('click', async () => {
+    if (isMP) {
+      page = await program.navigateTo(PAGE_PATH)
+      await page.waitFor('view')
+      const el = await page.$('#longpress-target')
+      await el.tap()
       await page.waitFor(500)
       const clickEventX = await page.$('#click-event-x')
       expect(parseInt(await clickEventX.text())).toBeGreaterThan(0)
       const clickEventY = await page.$('#click-event-y')
       expect(parseInt(await clickEventY.text())).toBeGreaterThan(0)
-    } else {
-      const el = await page.$('#longpress-target')
-      await el.tap()
-      await page.waitFor(100)
+    } else {
+      const el = await page.$('#longpress-target')
+      await el.tap()
+      await page.waitFor(100)
       const targetX = '0'
       const targetY = '0'
       const tapEventX = await page.$('#tap-event-x')
@@ -213,7 +213,7 @@ describe('event trigger', () => {
   it('longPress', async () => {
     if (!process.env.UNI_AUTOMATOR_APP_WEBVIEW) {
       const el = await page.$('#longpress-target')
-      await el.longpress()
+      await el.longpress()
       await page.waitFor(100)
       if (isMP) {
         const longPressTouchIdentifier = await page.$('#long-press-touch-identifier')
@@ -267,65 +267,63 @@ describe('event trigger', () => {
         expect(await longPressChangedTouchScreenX.text()).toBe(longPressTouchTargetValue)
         const longPressChangedTouchScreenY = await page.$('#long-press-changed-touch-screen-y')
         expect(await longPressChangedTouchScreenY.text()).toBe(longPressTouchTargetValue)
-      }
 
-      if (isAndroid || isIos) {
-        const longPressTouchTargetIdentifier = '1'
-        const longPressTouchTargetValue = '0'
-        if (isIos) {
-          // 规避系统授权弹框
+        if (isAndroid || isIos) {
+          if (isIos) {
+            // 规避系统授权弹框
+            await program.tap({
+              x: 100,
+              y: 500,
+            })
+          }
           await program.tap({
-            x: 100,
-            y: 500,
+            x: 200,
+            y: 400,
+            duration: 1000
           })
+          const longPressTouchIdentifierText = await longPressTouchIdentifier.text()
+          expect(longPressTouchIdentifierText).not.toBe(longPressTouchTargetIdentifier)
+          expect(longPressTouchIdentifierText).toBeTruthy()
+          const longPressTouchPageXText = await longPressTouchPageX.text()
+          expect(longPressTouchPageXText).not.toBe(longPressTouchTargetValue)
+          expect(longPressTouchPageXText).toBeTruthy()
+          const longPressTouchPageYText = await longPressTouchPageY.text()
+          expect(longPressTouchPageYText).not.toBe(longPressTouchTargetValue)
+          expect(longPressTouchPageYText).toBeTruthy()
+          const longPressTouchClientXText = await longPressTouchClientX.text()
+          expect(longPressTouchClientXText).not.toBe(longPressTouchTargetValue)
+          expect(longPressTouchClientXText).toBeTruthy()
+          const longPressTouchClientYText = await longPressTouchClientY.text()
+          expect(longPressTouchClientYText).not.toBe(longPressTouchTargetValue)
+          expect(longPressTouchClientYText).toBeTruthy()
+          const longPressTouchScreenXText = await longPressTouchScreenX.text()
+          expect(longPressTouchScreenXText).not.toBe(longPressTouchTargetValue)
+          expect(longPressTouchScreenXText).toBeTruthy()
+          const longPressTouchScreenYText = await longPressTouchScreenY.text()
+          expect(longPressTouchScreenYText).not.toBe(longPressTouchTargetValue)
+          expect(longPressTouchScreenYText).toBeTruthy()
+          const longPressChangedTouchIdentifierText = await longPressChangedTouchIdentifier.text()
+          expect(longPressChangedTouchIdentifierText).not.toBe(longPressTouchTargetIdentifier)
+          expect(longPressChangedTouchIdentifierText).toBeTruthy()
+          const longPressChangedTouchPageXText = await longPressChangedTouchPageX.text()
+          expect(longPressChangedTouchPageXText).not.toBe(longPressTouchTargetValue)
+          expect(longPressChangedTouchPageXText).toBeTruthy()
+          const longPressChangedTouchPageYText = await longPressChangedTouchPageY.text()
+          expect(longPressChangedTouchPageYText).not.toBe(longPressTouchTargetValue)
+          expect(longPressChangedTouchPageYText).toBeTruthy()
+          const longPressChangedTouchClientXText = await longPressChangedTouchClientX.text()
+          expect(longPressChangedTouchClientXText).not.toBe(longPressTouchTargetValue)
+          expect(longPressChangedTouchClientXText).toBeTruthy()
+          const longPressChangedTouchClientYText = await longPressChangedTouchClientY.text()
+          expect(longPressChangedTouchClientYText).not.toBe(longPressTouchTargetValue)
+          expect(longPressChangedTouchClientYText).toBeTruthy()
+          const longPressChangedTouchScreenXText = await longPressChangedTouchScreenX.text()
+          expect(longPressChangedTouchScreenXText).not.toBe(longPressTouchTargetValue)
+          expect(longPressChangedTouchScreenXText).toBeTruthy()
+          const longPressChangedTouchScreenYText = await longPressChangedTouchScreenY.text()
+          expect(longPressChangedTouchScreenYText).not.toBe(longPressTouchTargetValue)
+          expect(longPressChangedTouchScreenYText).toBeTruthy()
         }
-        await program.tap({
-          x: 200,
-          y: 400,
-          duration: 1000
-        })
-        const longPressTouchIdentifierText = await longPressTouchIdentifier.text()
-        expect(longPressTouchIdentifierText).not.toBe(longPressTouchTargetIdentifier)
-        expect(longPressTouchIdentifierText).toBeTruthy()
-        const longPressTouchPageXText = await longPressTouchPageX.text()
-        expect(longPressTouchPageXText).not.toBe(longPressTouchTargetValue)
-        expect(longPressTouchPageXText).toBeTruthy()
-        const longPressTouchPageYText = await longPressTouchPageY.text()
-        expect(longPressTouchPageYText).not.toBe(longPressTouchTargetValue)
-        expect(longPressTouchPageYText).toBeTruthy()
-        const longPressTouchClientXText = await longPressTouchClientX.text()
-        expect(longPressTouchClientXText).not.toBe(longPressTouchTargetValue)
-        expect(longPressTouchClientXText).toBeTruthy()
-        const longPressTouchClientYText = await longPressTouchClientY.text()
-        expect(longPressTouchClientYText).not.toBe(longPressTouchTargetValue)
-        expect(longPressTouchClientYText).toBeTruthy()
-        const longPressTouchScreenXText = await longPressTouchScreenX.text()
-        expect(longPressTouchScreenXText).not.toBe(longPressTouchTargetValue)
-        expect(longPressTouchScreenXText).toBeTruthy()
-        const longPressTouchScreenYText = await longPressTouchScreenY.text()
-        expect(longPressTouchScreenYText).not.toBe(longPressTouchTargetValue)
-        expect(longPressTouchScreenYText).toBeTruthy()
-        const longPressChangedTouchIdentifierText = await longPressChangedTouchIdentifier.text()
-        expect(longPressChangedTouchIdentifierText).not.toBe(longPressTouchTargetIdentifier)
-        expect(longPressChangedTouchIdentifierText).toBeTruthy()
-        const longPressChangedTouchPageXText = await longPressChangedTouchPageX.text()
-        expect(longPressChangedTouchPageXText).not.toBe(longPressTouchTargetValue)
-        expect(longPressChangedTouchPageXText).toBeTruthy()
-        const longPressChangedTouchPageYText = await longPressChangedTouchPageY.text()
-        expect(longPressChangedTouchPageYText).not.toBe(longPressTouchTargetValue)
-        expect(longPressChangedTouchPageYText).toBeTruthy()
-        const longPressChangedTouchClientXText = await longPressChangedTouchClientX.text()
-        expect(longPressChangedTouchClientXText).not.toBe(longPressTouchTargetValue)
-        expect(longPressChangedTouchClientXText).toBeTruthy()
-        const longPressChangedTouchClientYText = await longPressChangedTouchClientY.text()
-        expect(longPressChangedTouchClientYText).not.toBe(longPressTouchTargetValue)
-        expect(longPressChangedTouchClientYText).toBeTruthy()
-        const longPressChangedTouchScreenXText = await longPressChangedTouchScreenX.text()
-        expect(longPressChangedTouchScreenXText).not.toBe(longPressTouchTargetValue)
-        expect(longPressChangedTouchScreenXText).toBeTruthy()
-        const longPressChangedTouchScreenYText = await longPressChangedTouchScreenY.text()
-        expect(longPressChangedTouchScreenYText).not.toBe(longPressTouchTargetValue)
-        expect(longPressChangedTouchScreenYText).toBeTruthy()
       }
     }
   })
@@ -363,4 +361,4 @@ describe('event trigger', () => {
       expect(1).toBe(1)
     }
   })
-})
+})