提交 9c3952cd 编写于 作者: DCloud-WZF's avatar DCloud-WZF 💬

test(global-events): 调整 program.tap 坐标

上级 2f486a92
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
let res = element != null let res = element != null
// #ifndef APP-ANDROID // #ifndef APP-ANDROID
if(res){ if(res){
const elPage = element.getPage() const elPage = element!.getPage()
console.log('elPage', elPage) console.log('elPage', elPage)
res = elPage === page res = elPage === page
} }
......
...@@ -29,7 +29,7 @@ describe('event trigger', () => { ...@@ -29,7 +29,7 @@ describe('event trigger', () => {
clientY: 101, clientY: 101,
screenX: 101, screenX: 101,
screenY: 101 screenY: 101
},], }, ],
changedTouches: [{ changedTouches: [{
identifier: 1, identifier: 1,
pageX: 101, pageX: 101,
...@@ -38,7 +38,7 @@ describe('event trigger', () => { ...@@ -38,7 +38,7 @@ describe('event trigger', () => {
clientY: 101, clientY: 101,
screenX: 101, screenX: 101,
screenY: 101 screenY: 101
},], }, ],
}) })
const touchStartTouchTargetIdentifier = isAndroid ? '1.0' : '1' const touchStartTouchTargetIdentifier = isAndroid ? '1.0' : '1'
const touchStartTouchTargetValue = isAndroid ? '101.0' : '101' const touchStartTouchTargetValue = isAndroid ? '101.0' : '101'
...@@ -90,7 +90,7 @@ describe('event trigger', () => { ...@@ -90,7 +90,7 @@ describe('event trigger', () => {
clientY: 102, clientY: 102,
screenX: 102, screenX: 102,
screenY: 102 screenY: 102
},], }, ],
}) })
const touchMoveTouchTargetIdentifier = isAndroid ? '1.0' : '1' const touchMoveTouchTargetIdentifier = isAndroid ? '1.0' : '1'
...@@ -142,7 +142,7 @@ describe('event trigger', () => { ...@@ -142,7 +142,7 @@ describe('event trigger', () => {
clientY: 103, clientY: 103,
screenX: 103, screenX: 103,
screenY: 103 screenY: 103
},], }, ],
}) })
const touchEndTouchTargetIdentifier = isAndroid ? '1.0' : '1' const touchEndTouchTargetIdentifier = isAndroid ? '1.0' : '1'
const touchEndTouchTargetValue = isAndroid ? '103.0' : '103' const touchEndTouchTargetValue = isAndroid ? '103.0' : '103'
...@@ -228,38 +228,18 @@ describe('event trigger', () => { ...@@ -228,38 +228,18 @@ describe('event trigger', () => {
expect(await longPressChangedTouchScreenY.text()).toBe(longPressTouchTargetValue) expect(await longPressChangedTouchScreenY.text()).toBe(longPressTouchTargetValue)
if (isAndroid || isIos) { if (isAndroid || isIos) {
if (isAndroid) { if (isIos) {
if (platformInfo.indexOf('6') != -1 && platformInfo.indexOf('x86') == -1) {
await program.tap({
x: 200,
y: 700,
duration: 1000
})
} else if (platformInfo.indexOf('12') != -1) {
await program.tap({
x: 300,
y: 1100,
duration: 1000
})
} else {
await program.tap({
x: 200,
y: 1000,
duration: 1000
})
}
} else if (isIos) {
// 规避系统授权弹框 // 规避系统授权弹框
await program.tap({ await program.tap({
x: 100, x: 100,
y: 500, y: 500,
}) })
}
await program.tap({ await program.tap({
x: 200, x: 200,
y: 400, y: 400,
duration: 1000 duration: 1000
}) })
}
const longPressTouchIdentifierText = await longPressTouchIdentifier.text() const longPressTouchIdentifierText = await longPressTouchIdentifier.text()
expect(longPressTouchIdentifierText).not.toBe(longPressTouchTargetIdentifier) expect(longPressTouchIdentifierText).not.toBe(longPressTouchTargetIdentifier)
expect(longPressTouchIdentifierText).toBeTruthy() expect(longPressTouchIdentifierText).toBeTruthy()
...@@ -343,7 +323,5 @@ describe('event trigger', () => { ...@@ -343,7 +323,5 @@ describe('event trigger', () => {
} else { } else {
expect(1).toBe(1) expect(1).toBe(1)
} }
}) })
}) })
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册