From c636abee6326cc9bb067871592b73ac0c5badf3b Mon Sep 17 00:00:00 2001 From: jixinbao Date: Thu, 25 Jul 2024 19:36:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20watchEffect=20=E5=9C=A8=20iOS=20=20?= =?UTF-8?q?=E8=A1=A8=E7=8E=B0=E8=A1=8C=E4=B8=BA=E5=92=8C=20web=20=E5=AF=B9?= =?UTF-8?q?=E9=BD=90=EF=BC=8C=E6=8A=B9=E5=B9=B3=E5=B7=AE=E5=BC=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/watch-effect/watch-effect.test.js | 18 ++++-------------- .../watch-post-effect.test.js | 11 +---------- .../watch-sync-effect.test.js | 14 +------------- 3 files changed, 6 insertions(+), 37 deletions(-) diff --git a/pages/reactivity/core/watch-effect/watch-effect.test.js b/pages/reactivity/core/watch-effect/watch-effect.test.js index 29764a0..6adec32 100644 --- a/pages/reactivity/core/watch-effect/watch-effect.test.js +++ b/pages/reactivity/core/watch-effect/watch-effect.test.js @@ -6,7 +6,6 @@ describe('watchEffect', () => { const isAndroid = platformInfo.startsWith('android') const isIos = platformInfo.startsWith('ios') const isWeb = platformInfo.startsWith('web') - beforeAll(async () => { page = await program.reLaunch(PAGE_PATH) await page.waitFor('view') @@ -22,10 +21,7 @@ describe('watchEffect', () => { // track const watchCountTrackNum = await page.$('#watch-count-track-num') if (isAndroid) { - expect(await watchCountTrackNum.text()).toBe('3') - } else if (isIos) { - // TODO: 确认 IOS 的差异是否正常 - expect(await watchCountTrackNum.text()).toBe('11') + expect(await watchCountTrackNum.text()).toBe('3') } else { expect(await watchCountTrackNum.text()).toBe('6') } @@ -46,8 +42,6 @@ describe('watchEffect', () => { if (isAndroid) { expect(await watchCountTrackNum.text()).toBe('3') - } else if (isIos) { - expect(await watchCountTrackNum.text()).toBe('19') } else { expect(await watchCountTrackNum.text()).toBe('9') } @@ -64,9 +58,7 @@ describe('watchEffect', () => { if (isAndroid) { expect(await watchCountTrackNum.text()).toBe('3') - } else if (isIos) { - expect(await watchCountTrackNum.text()).toBe('27') - } else { + } else { expect(await watchCountTrackNum.text()).toBe('12') } expect(await watchCountCleanupRes.text()).toBe('watch count cleanup: 2') @@ -85,9 +77,7 @@ describe('watchEffect', () => { if (isAndroid) { expect(await watchCountTrackNum.text()).toBe('3') - } else if (isIos) { - expect(await watchCountTrackNum.text()).toBe('27') - } else { + } else { expect(await watchCountTrackNum.text()).toBe('12') } expect(await watchCountCleanupRes.text()).toBe('watch count cleanup: 2') @@ -157,4 +147,4 @@ describe('watchEffect', () => { const watchCountAndObjNumRes = await page.$('#watch-count-obj-num-res') expect(await watchCountAndObjNumRes.text()).toBe('count: 3, obj.num: 1') }) -}) \ No newline at end of file +}) diff --git a/pages/reactivity/core/watch-post-effect/watch-post-effect.test.js b/pages/reactivity/core/watch-post-effect/watch-post-effect.test.js index 9153118..b8a0d04 100644 --- a/pages/reactivity/core/watch-post-effect/watch-post-effect.test.js +++ b/pages/reactivity/core/watch-post-effect/watch-post-effect.test.js @@ -24,9 +24,6 @@ describe('watchPostEffect', () => { const watchCountTrackNum = await page.$('#watch-count-track-num') if (isAndroid) { expect(await watchCountTrackNum.text()).toBe('3') - } else if (isIos) { - // TODO: 确认 IOS 的差异是否正常 - expect(await watchCountTrackNum.text()).toBe('8') } else { expect(await watchCountTrackNum.text()).toBe('3') } @@ -52,8 +49,6 @@ describe('watchPostEffect', () => { if (isAndroid) { expect(await watchCountTrackNum.text()).toBe('3') - } else if (isIos) { - expect(await watchCountTrackNum.text()).toBe('16') } else { expect(await watchCountTrackNum.text()).toBe('6') } @@ -70,8 +65,6 @@ describe('watchPostEffect', () => { if (isAndroid) { expect(await watchCountTrackNum.text()).toBe('3') - } else if (isIos) { - expect(await watchCountTrackNum.text()).toBe('24') } else { expect(await watchCountTrackNum.text()).toBe('9') } @@ -92,8 +85,6 @@ describe('watchPostEffect', () => { if (isAndroid) { expect(await watchCountTrackNum.text()).toBe('3') - } else if (isIos) { - expect(await watchCountTrackNum.text()).toBe('24') } else { expect(await watchCountTrackNum.text()).toBe('9') } @@ -146,4 +137,4 @@ describe('watchPostEffect', () => { const watchCountAndObjNumRes = await page.$('#watch-count-obj-num-res') expect(await watchCountAndObjNumRes.text()).toBe('count: 3, obj.num: 1') }) -}) \ No newline at end of file +}) diff --git a/pages/reactivity/core/watch-sync-effect/watch-sync-effect.test.js b/pages/reactivity/core/watch-sync-effect/watch-sync-effect.test.js index 4605ad9..ee36f95 100644 --- a/pages/reactivity/core/watch-sync-effect/watch-sync-effect.test.js +++ b/pages/reactivity/core/watch-sync-effect/watch-sync-effect.test.js @@ -24,9 +24,6 @@ describe('watchSyncEffect', () => { const watchCountTrackNum = await page.$('#watch-count-track-num') if (isAndroid) { expect(await watchCountTrackNum.text()).toBe('3') - } else if (isIos) { - // TODO: 确认 IOS 的差异是否正常 - expect(await watchCountTrackNum.text()).toBe('11') } else { expect(await watchCountTrackNum.text()).toBe('6') } @@ -47,9 +44,6 @@ describe('watchSyncEffect', () => { if (isAndroid) { expect(await watchCountTrackNum.text()).toBe('3') - } else if (isIos) { - // TODO: 确认 IOS 的差异是否正常 - expect(await watchCountTrackNum.text()).toBe('19') } else { expect(await watchCountTrackNum.text()).toBe('9') } @@ -66,9 +60,6 @@ describe('watchSyncEffect', () => { if (isAndroid) { expect(await watchCountTrackNum.text()).toBe('3') - } else if (isIos) { - // TODO: 确认 IOS 的差异是否正常 - expect(await watchCountTrackNum.text()).toBe('27') } else { expect(await watchCountTrackNum.text()).toBe('12') } @@ -89,9 +80,6 @@ describe('watchSyncEffect', () => { if (isAndroid) { expect(await watchCountTrackNum.text()).toBe('3') - } else if (isIos) { - // TODO: 确认 IOS 的差异是否正常 - expect(await watchCountTrackNum.text()).toBe('27') } else { expect(await watchCountTrackNum.text()).toBe('12') } @@ -144,4 +132,4 @@ describe('watchSyncEffect', () => { const watchCountAndObjNumRes = await page.$('#watch-count-obj-num-res') expect(await watchCountAndObjNumRes.text()).toBe('count: 3, obj.num: 1') }) -}) \ No newline at end of file +}) -- GitLab