From 21b4a9055c59e845554ab41232a80b2e21267fe7 Mon Sep 17 00:00:00 2001 From: anne-lxm <1076217653@qq.com> Date: Wed, 10 Nov 2021 17:50:40 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=98=B5?= =?UTF-8?q?=E7=A7=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env.js | 56 +++++++++--------- pages/list/search/search.test.js | 2 +- .../login-page/pwd-login/pwd-login.test.js | 21 ++----- .../login-page/pwd-login/pwd-login.vue | 3 - .../login-page/register/register.test.js | 1 - .../userinfo/bind-mobile/bind-mobile.test.js | 4 ++ pages/ucenter/userinfo/userinfo.test.js | 13 ++-- static/screenshot/about-mp.png | Bin 0 -> 24459 bytes 8 files changed, 43 insertions(+), 57 deletions(-) create mode 100644 static/screenshot/about-mp.png diff --git a/env.js b/env.js index 4b3f357c..14c906f6 100644 --- a/env.js +++ b/env.js @@ -1,30 +1,30 @@ module.exports = { - "compile": true, - "h5": { - "options": { - "headless": false - }, - "executablePath": "C:/Program Files/Google/Chrome/Application/chrome.exe" - }, - "mp-weixin": { - "port": 9420, - "account": "", - "args": "", - "cwd": "", - "launch": true, - "teardown": "disconnect", - "remote": false, - "executablePath": "C:/Users/liuxi/download/微信web开发者工具/cli.bat" - }, - "app-plus": { - "android": { - "id": "", - "executablePath": "D:/HX/alpha-3.1.3/HBuilderX/plugins/launcher/base/android_base.apk" - }, - "version": "", - "ios": { - "id": "", - "executablePath": "" - } - } + "compile": true, + "h5": { + "options": { + "headless": false + }, + "executablePath": "C:/Program Files/Google/Chrome/Application/chrome.exe" + }, + "mp-weixin": { + "port": 9420, + "account": "", + "args": "", + "cwd": "", + "launch": true, + "teardown": "disconnect", + "remote": false, + "executablePath": "C:/Users/liuxi/download/微信web开发者工具/cli.bat" + }, + "app-plus": { + "android": { + "id": "d3a144fa", + "executablePath": "D:\\HX\\alpha-3.1.3\\HBuilderX\\plugins\\launcher\\base\\android_base.apk" + }, + "version": "D:\\HX\\alpha-3.1.3\\HBuilderX\\plugins\\launcher\\base\\version.txt", + "ios": { + "id": "", + "executablePath": "" + } + } } diff --git a/pages/list/search/search.test.js b/pages/list/search/search.test.js index cfbb98f7..9e17e745 100644 --- a/pages/list/search/search.test.js +++ b/pages/list/search/search.test.js @@ -4,7 +4,7 @@ describe('pages/list/search/search.vue', () => { let page beforeAll(async () => { - page = await program.navigateTo('/pages/list/search/search') + page = await program.redirectTo('/pages/list/search/search') await page.waitFor(500) }) it('搜索发现-显示-影藏', async () => { diff --git a/pages/ucenter/login-page/pwd-login/pwd-login.test.js b/pages/ucenter/login-page/pwd-login/pwd-login.test.js index bf20f2c2..598e1a35 100644 --- a/pages/ucenter/login-page/pwd-login/pwd-login.test.js +++ b/pages/ucenter/login-page/pwd-login/pwd-login.test.js @@ -16,23 +16,12 @@ describe('pages/ucenter/login-page/pwd-login/pwd-login.vue', () => { expect((await program.currentPage()).path).toBe( 'pages/ucenter/login-page/register/register') console.log(await program.currentPage(),"111111111"); - // await page.waitFor(500) + await page.waitFor(500) // 执行 navigateBack 验证是否返回navigateTo - // expect((await program.navigateBack()).path).toBe( - // 'pages/ucenter/login-page/pwd-login/pwd-login') - }) - - it('跳转到忘记密码页', async () => { - const resPwd = await page.callMethod('toRetrievePwd') - - await page.waitFor(300) - expect((await program.currentPage()).path).toBe( - 'pages/ucenter/login-page/pwd-retrieve/pwd-retrieve') - console.log(await program.currentPage(),"222222"); - // await page.waitFor(500) - // 执行 navigateBack 验证是否返回 - // expect((await program.navigateBack()).path).toBe( - // 'pages/ucenter/login-page/pwd-login/pwd-login') + expect((await program.navigateBack()).path).toBe( + 'pages/ucenter/login-page/pwd-login/pwd-login') + + console.log(await program.currentPage(),"22222222222"); }) it('用户名密码登录', async () => { diff --git a/pages/ucenter/login-page/pwd-login/pwd-login.vue b/pages/ucenter/login-page/pwd-login/pwd-login.vue index 2a972e5a..30ea69a5 100644 --- a/pages/ucenter/login-page/pwd-login/pwd-login.vue +++ b/pages/ucenter/login-page/pwd-login/pwd-login.vue @@ -159,9 +159,6 @@ uni.navigateTo({ url: '/pages/ucenter/login-page/register/register' }) - // uni.redirectTo({ - // url: '/pages/ucenter/login-page/register/register' - // }) } } } diff --git a/pages/ucenter/login-page/register/register.test.js b/pages/ucenter/login-page/register/register.test.js index 076c306b..da5e5b6b 100644 --- a/pages/ucenter/login-page/register/register.test.js +++ b/pages/ucenter/login-page/register/register.test.js @@ -41,7 +41,6 @@ describe('pages/ucenter/login-page/register/register.vue', () => { await page.waitFor(300) return resRegister }) - console.log("getUid:---------- ",getUid.msg); if (getUid.uid) { expect(getUid.msg).toBe("注册成功"); diff --git a/pages/ucenter/userinfo/bind-mobile/bind-mobile.test.js b/pages/ucenter/userinfo/bind-mobile/bind-mobile.test.js index 2c87550f..3166380a 100644 --- a/pages/ucenter/userinfo/bind-mobile/bind-mobile.test.js +++ b/pages/ucenter/userinfo/bind-mobile/bind-mobile.test.js @@ -55,6 +55,10 @@ describe('pages/ucenter/userinfo/bind-mobile/bind-mobile.vue', () => { break; } } + + await program.switchTab('/pages/ucenter/ucenter') + + console.log(await program.currentPage(),"last-------------------"); }) }); \ No newline at end of file diff --git a/pages/ucenter/userinfo/userinfo.test.js b/pages/ucenter/userinfo/userinfo.test.js index 4daadde3..5ee9bf6a 100644 --- a/pages/ucenter/userinfo/userinfo.test.js +++ b/pages/ucenter/userinfo/userinfo.test.js @@ -9,15 +9,14 @@ describe('pages/ucenter/userinfo/userinfo.vue', () => { }) - /* it('设置昵称', async () => { + it('设置昵称', async () => { const getTokenRes = await page.waitFor(async()=>{ return await page.data('uniToken') }) - console.log("getTokenRes: ",getTokenRes); + console.log("getTokenRes:---------------------- ",getTokenRes); var name = "数字天堂DCloud" + Math.round(Math.random()*10); console.log("name: ",name); - console.log(await page.data('uniToken'),"---------------------"); if(getTokenRes){ const nicknameRes = await page.callMethod("setNickname",name) await page.waitFor(300) @@ -25,15 +24,13 @@ describe('pages/ucenter/userinfo/userinfo.vue', () => { expect(nicknameRes.updated).toBe(1) } - }) */ + }) it('绑定手机号', async () => { - console.log(await page.data('uniToken'),"-------------------------"); await page.callMethod('bindMobileBySmsCode') await page.waitFor(300) - console.log((await program.currentPage()).path); - expect((await program.currentPage()).path).toBe('pages/ucenter/userinfo/bind-mobile/bind-mobile') - await page.waitFor(300) + // expect((await program.currentPage()).path).toBe('pages/ucenter/userinfo/bind-mobile/bind-mobile') + // await page.waitFor(300) expect((await program.navigateBack()).path).toBe('pages/ucenter/userinfo/userinfo') }) diff --git a/static/screenshot/about-mp.png b/static/screenshot/about-mp.png new file mode 100644 index 0000000000000000000000000000000000000000..761e211db5d87ead08a7ffc990a2bc5a5117bbe0 GIT binary patch literal 24459 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