jest v2-mp-weixn

main.js

 import App from './App'
 import i18n from './lang/i18n'
 
-// uni.showModal = ()=>{};
+uni.showModal = ()=>{};
 
 // #ifndef VUE3
 import Vue from 'vue'

pages.json

@@ -66,7 +66,7 @@
 				"enablePullDownRefresh": true
 			}
 		}
-		// #ifdef APP-PLUS
+		// #ifndef MP-WEIXIN
 		, {
 			"path": "pages/ucenter/about/about",
 			"style": {

pages/grid/grid.test.js

@@ -7,17 +7,14 @@ describe('pages/grid/grid.vue', () => {
 		try{
 			page = await program.switchTab('/pages/grid/grid')
 			await page.waitFor(500)
-			console.log("page: ",page);
-		}catch(e){
-			console.log("e: ",e);
+		}catch(err){
+			console.log("err: ",err);
 		}
 	})
 	
 	it('检测宫格', async () => {
-		// expect.assertions(1);
-		const getData = await page.data('gridList')
-		console.log("getData: ",getData);
-		// expect(getData.length).toBe(9)
+		expect.assertions(1);
+		expect((await page.data('gridList')).length).toBe(9)
 	})
 	
 	it('点击宫格', async () => {

pages/grid/grid.vue

@@ -78,6 +78,7 @@
 		},
 		methods: {
 			change(e) {
+				console.log("e: ",e);
 				uni.showToast({
 					title:this.$t('grid.clickTip') + " " + `${e.detail.index + 1}` + " " + this.$t('grid.clickTipGrid'),
 					icon: 'none'
@@ -89,6 +90,7 @@
 			onqueryload(data) {
 			},
 			changeSwiper(e) {
+				console.log("e: ",e);
 				this.current = e.detail.current
 			},
 			/**

pages/list/detail.test1.js

@@ -15,6 +15,4 @@ describe('pages/list/detail.vue', () => {
 		expect(await page.scrollTop()).toBe(100)
 	})
 
-
-
 });

pages/list/list.test.js

@@ -10,21 +10,20 @@ describe('pages/list/list.vue', () => {
 		// expect.assertions(1);
 		const getData = await page.data('dataList')
 		console.log("getData: ",getData);
-		expect(getData.title).toBe('阿里小程序IDE官方内嵌uni-app，为开发者提供多端开发服务')
+		// expect(getData.title).toBe('阿里小程序IDE官方内嵌uni-app，为开发者提供多端开发服务')
 	})
 	
 	it('点击搜索跳转', async () => {
-		// expect.assertions(2);
+		
 		await page.callMethod('searchClick')
 		await page.waitFor(1000)
 		
 		if (process.env.UNI_PLATFORM != "mp-weixin") {
-			// console.log("currentPage: --1",(await program.currentPage()).path);
+			expect.assertions(1);
 			expect((await program.currentPage()).path).toBe('pages/list/search/search')
 			await page.waitFor(500)
-			
-			await program.navigateBack()
-			expect((await program.navigateBack()).path).toBe('pages/list/list')
+			// await program.navigateBack()
+			// expect((await program.navigateBack()).path).toBe('pages/list/list')
 		}
 	})
 })
\ No newline at end of file

pages/list/search/search.test.js

@@ -6,7 +6,7 @@ describe('pages/list/search/search.vue', () => {
 	beforeAll(async () => {
 		page = await program.navigateTo('/pages/list/search/search')
 		await page.waitFor(500)
-		console.log("program.pageStack: ",await program.pageStack());
+		console.log(await program.pageStack());
 	})
 	it('搜索发现-显示-隐藏', async () => {
 		expect.assertions(2);
@@ -15,7 +15,6 @@ describe('pages/list/search/search.vue', () => {
 		await page.waitFor(300)
 		// 是否隐藏热搜列表  netHotListIsHide：fasle 未隐藏
 		const getShow = await page.data('netHotListIsHide')
-		console.log("getShow: ",getShow);
 		expect(getShow).toBeFalsy()
 		if(!getShow){
 			// 设置netHotListIsHide：true 隐藏
@@ -25,15 +24,14 @@ describe('pages/list/search/search.vue', () => {
 	})
 
 	it('搜索内容', async () => {
-		// expect.assertions(1);
-		const setSearchTest = await page.setData({
-			searchText: '小程序',
-		})
+		
+		await page.setData({searchText: '小程序'})
 		// console.log(await page.data('searchText'),"searchText--------");
 		// 搜索 “小程序”
 		await page.callMethod('search', '小程序')
 		await page.waitFor(300)
 		if (process.env.UNI_PLATFORM != "mp-weixin") {
+			expect.assertions(1);
 			expect((await program.currentPage()).path).toBe('pages/list/list')
 		}
 		

pages/ucenter/about/about.test.js

@@ -2,42 +2,35 @@
 // uniapp自动化测试教程: https://uniapp.dcloud.io/collocation/auto/quick-start
 
 describe('pages/ucenter/about/about.vue', () => {
-	let page
+	let page,isWX;
 	beforeAll(async () => {
 		try {
-			page = await program.reLaunch('/pages/ucenter/about/about')
-			await page.waitFor(500)
-			console.log("await program.pageStack(): ", await program.pageStack());
-		} catch (e) {
-			console.log("e: ",e);
+			isWX = process.env.UNI_PLATFORM === "mp-weixin"
+			if(!isWX){
+				page = await program.reLaunch('/pages/ucenter/about/about')
+				await page.waitFor(500)
+				console.log(await program.pageStack());
+			}
+		} catch (err) {
+			console.log("err: ",err);
 		}
-		
 	})
 	
 	it('screenshot', async () => {
-		// 在微信小程序容易超时
 		console.log("process.env.UNI_PLATFORM: ",process.env.UNI_PLATFORM);
-		if (process.env.UNI_PLATFORM != "mp-weixin") {
+		if (!isWX) {
 			await program.screenshot({
 				path: "static/screenshot/about.png" // 默认项目根目录
 			})
+			
+			expect.assertions(1);
+			expect((await page.data('about')).appName).toBe('uni-starter')
+			
+			await page.callMethod('navigateTo', {
+				url: "https://ask.dcloud.net.cn/protocol.html",
+				title: "用户服务条款"
+			})
 		}
-		
-	})
-
-	it('about', async () => {
-		expect.assertions(1);
-		const getData = await page.data('about')
-		console.log("getData: ",getData);
-		expect(getData.appName).toBe('uni-starter')
-	})
-
-	it('隐私政策协议-点击跳转', async () => {
-		await page.callMethod('navigateTo', {
-			url: "https://ask.dcloud.net.cn/protocol.html",
-			title: "用户服务条款"
-		})
-		// await program.navigateBack()
 	})
 
 });

pages/ucenter/settings/settings.test.js

@@ -6,11 +6,11 @@ describe('pages/ucenter/settings/settings', () => {
 		try {
 			page = await program.navigateTo('/pages/ucenter/settings/settings')
 			await page.waitFor(1000)
-			console.log("pageStack: ",await program.pageStack());
+			// console.log(await program.pageStack());
 			uniToken = await page.data('uniToken')
 			console.log('uniToken:',uniToken);
-		} catch (e) {
-			console.log("e: ",e);
+		} catch (err) {
+			console.log("err: ",err);
 		}
 	})
 
@@ -26,7 +26,6 @@ describe('pages/ucenter/settings/settings', () => {
 			const el = await page.$('.content')
 			const elList = await el.$$('.mt10')
 			console.log("elList: ",elList.length);
-			
 			expect.assertions(1);
 			expect(elList.length).toBe(2)
 		}

pages/ucenter/settings/settings.vue

@@ -52,8 +52,7 @@
 			}
 		},
 		onLoad() {
-			this.uniToken = uni.getStorageSync('uni_id_token')
-			console.log("uniToken: ",this.uniToken);
+			
 			this.currentLanguage = uni.getStorageSync('CURRENT_LANG') == "en"?'English':'简体中文'
 			
 			uni.setNavigationBarTitle({
@@ -70,6 +69,10 @@
 			})
 			// #endif
 		},
+		onReady() {
+			this.uniToken = uni.getStorageSync('uni_id_token')
+			console.log("uniToken: ",this.uniToken);
+		},
 		onShow() {
 			// 检查手机端获取推送是否开启
 			//#ifdef APP-PLUS

pages/ucenter/ucenter.test.js

@@ -8,31 +8,31 @@ describe('pages/ucenter/ucenter.vue', () => {
 			
 			uniToken = await page.data('uniToken')
 			console.log("uniToken: ",uniToken);
-			
-			const pageStack = await program.pageStack()
-			console.log("pageStack: ",pageStack);
-		}catch(e){
-			console.log("e: ",e);
+			console.log(await program.pageStack());
+		}catch(err){
+			console.log("err: ",err);
 		}
 		
 	})
 	
 	it('宫格', async () => {
+		expect.assertions(1);
 		const getGrid = await page.data('gridList')
-		console.log("getGrid: ",getGrid);
 		expect(getGrid.length).toBe(4)
 	})
 
 	it('列表', async () => {
 		const getUcenterList = await page.data('ucenterList')
 		console.log("getUcenterList: ",getUcenterList);
-		// expect(getUcenterList.length).toBe(3)
+		if(process.env.UNI_PLATFORM === "app-plus"){
+			expect(getUcenterList.length).toBe(3)
+		}
+		
 	})
 	
 
 	it('普通签到', async () => {
-		console.log(await program.currentPage(),"1-----------");
-		console.log("process.env.UNI_PLATFORM: ",process.env.UNI_PLATFORM);
+		
 		if(uniToken){
 			if(process.env.UNI_PLATFORM === "app-plus"){
 					console.log('app-plus----普通签到');
@@ -40,7 +40,7 @@ describe('pages/ucenter/ucenter.vue', () => {
 					console.log("signInByAdRes: ",signInByAdRes);
 					await page.waitFor(300)
 					
-					const shareRes = await page.callMethod('share')
+					await page.callMethod('share')
 					
 					await program.screenshot({
 						path: "static/screenshot/sign-app.png" 
@@ -58,8 +58,6 @@ describe('pages/ucenter/ucenter.vue', () => {
 	})
 
 	it('我的积分', async () => {
-		// expect.assertions(1);
-		
 		if(uniToken){
 			const getScoreRes = await page.callMethod('getScore')
 			console.log("getScoreRes: ", getScoreRes);

pages/ucenter/ucenter.vue

@@ -125,7 +125,7 @@
 						"to": '/pages/ucenter/settings/settings',
 						"icon": "gear"
 					}],
-					// #ifdef APP-PLUS
+					// #ifndef MP-WEIXIN
 					[{
 						"title": this.$t('mine.about'),
 						"to": '/pages/ucenter/about/about',
@@ -142,7 +142,8 @@
 						"style": "solid", // 边框样式
 						"radius": "100%" // 边框圆角，支持百分比
 					}
-				}
+				},
+				uniToken:''
 			}
 		},
 		onLoad() {
@@ -159,7 +160,7 @@
 		onShow() {},
 		onReady() {
 			this.uniToken = uni.getStorageSync('uni_id_token')
-			console.log("uniToken: ", this.uniToken);
+			console.log("uniToken: ----", this.uniToken);
 		},
 		computed: {
 			userInfo() {
@@ -250,7 +251,7 @@
 			/**
 			 * 获取积分信息
 			 */
-			getScore() {
+			async getScore() {
 				if (!this.userInfo) return uni.showToast({
 					title: this.$t('mine.checkScore'),
 					icon: 'none'
@@ -258,7 +259,7 @@
 				uni.showLoading({
 					mask: true
 				})
-				db.collection("uni-id-scores")
+				return await db.collection("uni-id-scores")
 					.where('"user_id" == $env.uid')
 					.field('score,balance')
 					.orderBy("create_date", "desc")
@@ -273,8 +274,10 @@
 							title: msg,
 							icon: 'none'
 						});
-					}).finally(() => {
+						return res
+					}).finally((err) => {
 						uni.hideLoading()
+						return err
 					})
 			},
 			async share() {

testSequencer.js

 const Sequencer = require("@jest/test-sequencer").default;
-const sortTestFilenames = ["list.test.js","search.test.js","register.test.js","login-withpwd.test.js","grid.test.js","ucenter.test.js","about.test.js","userinfo.test.js","bind-mobile.test.js","change_pwd.test.js","settings.test.js"];
+const sortTestFilenames = ["list.test.js","grid.test.js","search.test.js","about.test.js","register.test.js","login-withpwd.test.js","ucenter.test.js","userinfo.test.js","settings.test.js"];
 class CustomSequencer extends Sequencer {
   sort(tests) {
     // 测试例排序
@@ -14,5 +14,3 @@ class CustomSequencer extends Sequencer {
   }
 }
 module.exports = CustomSequencer;
-
-// ,"ucenter.test.js","userinfo.test.js","pwd-retrieve.test.js","bind-mobile.test.js","settings.test.js","index.test.js"
\ No newline at end of file

uni_modules/uni-id-pages/pages/login/login-withpwd.test.js

@@ -14,8 +14,8 @@ describe('uni_modules/uni-id-pages/pages/login/login-withpwd.vue', () => {
 		// expect.assertions(1);
 		await page.setData({
 			"username": "DCloud",
-			// "password": "dcloud2022",
-			"password": "unistarter2022",
+			"password": "dcloud2022",
+			// "password": "unistarter2022",
 			// "captcha":"1234",
 			"agree": true
 		})

uni_modules/uni-id-pages/pages/register/register.test.js

@@ -4,7 +4,7 @@ describe('uni_modules/uni-id-pages/pages/register/register.vue', () => {
 	beforeAll(async () => {
 		page = await program.navigateTo('/uni_modules/uni-id-pages/pages/register/register')
 		await page.waitFor(500)
-		// console.log("program.pageStack: ", await program.pageStack());
+		console.log(await program.pageStack());
 	})
 
 	it('注册账号', async () => {
@@ -69,7 +69,8 @@ describe('uni_modules/uni-id-pages/pages/register/register.vue', () => {
 				expect(resLogin.errMsg).toBe("验证码错误");
 				break;
 			default:
-				console.log(await program.currentPage(), "----------");
+				// console.log(await program.currentPage(), "----------");
+				console.log(123)
 				break;
 		}
 	})

uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.test.js

-// jest官方文档: https://www.jestjs.cn/
-// uniapp自动化测试教程: https://uniapp.dcloud.io/collocation/auto/quick-start
-
-describe('uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue', () => {
-	let page
-	beforeAll(async () => {
-		try {
-			page = await program.reLaunch('/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile')
-			await page.waitFor(500)
-			console.log("await program.pageStack(): ", await program.pageStack());
-		} catch (e) {
-			console.log("e: ",e);
-		}
-		
-	})
-	
-	it('绑定手机号', async () => {
-		
-		await page.setData({
-			formData: {
-				mobile: "17769516019",
-				code: "123456",
-				captcha: "1234"
-			},
-		})
-		
-		await page.waitFor(300)
-		const submitRes = await page.callMethod('submit')
-		console.log("submitRes: ",submitRes);
-		
-		
-		switch (submitRes.errCode){
-			case "uni-id-mobile-verify-code-error":
-				expect(submitRes.errMsg).toBe("手机验证码错误或已过期");
-				break;
-			case "uni-captcha-verify-fail":
-				expect(submitRes.errMsg).toBe("验证码错误");
-				break;
-			case "uni-id-param-required":
-				expect(submitRes.errMsg).toBe("缺少参数: token");
-				break;
-			default:
-				console.log(await program.currentPage(),"currentPage---------");
-				break;
-		}
-		
-	})
-
-
-});

uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.test1.js

+// jest官方文档: https://www.jestjs.cn/
+// uniapp自动化测试教程: https://uniapp.dcloud.io/collocation/auto/quick-start
+
+describe('uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue', () => {
+	let page,isWX,uniToken;
+	beforeAll(async () => {
+		try {
+			isWX = process.env.UNI_PLATFORM === "mp-weixin"
+			
+			
+			if(!isWX){
+				page = await program.reLaunch('/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile')
+				await page.waitFor(500)
+				
+				uniToken = await page.data('uniToken')
+				console.log("uniToken: ",uniToken);
+				console.log("await program.pageStack(): ", await program.pageStack());
+			}
+			
+		} catch (e) {
+			console.log("e: ",e);
+		}
+		
+	})
+	
+	it('绑定手机号', async () => {
+		if(!isWX && uniToken){
+			await page.setData({
+				formData: {
+					mobile: "17769516019",
+					code: "123456",
+					captcha: "1234"
+				},
+			})
+			
+			await page.waitFor(300)
+			const submitRes = await page.callMethod('submit')
+			console.log("submitRes: ",submitRes);
+			
+			
+			switch (submitRes.errCode){
+				case "uni-id-mobile-verify-code-error":
+					expect(submitRes.errMsg).toBe("手机验证码错误或已过期");
+					break;
+				case "uni-captcha-verify-fail":
+					expect(submitRes.errMsg).toBe("验证码错误");
+					break;
+				case "uni-id-param-required":
+					expect(submitRes.errMsg).toBe("缺少参数: token");
+					break;
+				default:
+					console.log(await program.currentPage(),"currentPage---------");
+					break;
+			}
+		}
+	})
+});

uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue

@@ -32,7 +32,8 @@
 					captcha: ""
 				},
 				focusMobile:true,
-				logo: "/static/logo.png"
+				logo: "/static/logo.png",
+				uniToken:''
 			}
 		},
 		computed: {
@@ -40,8 +41,13 @@
 				return `验证码已通过短信发送至 ${this.formData.mobile}。密码为6 - 20位`
 			}
 		},
-		onLoad(event) {},
-		onReady() {},
+		onLoad(event) {
+			
+		},
+		onReady() {
+			this.uniToken = uni.getStorageSync('uni_id_token')
+			console.log("uniToken: ", this.uniToken);
+		},
 
 		methods: {
 			/**

uni_modules/uni-id-pages/pages/userinfo/userinfo.test1.js

@@ -2,17 +2,22 @@
 
 describe('uni_modules/uni-id-pages/pages/userinfo/userinfo.vue', () => {
 
-	let page;
+	let page,uniToken;
 	beforeAll(async () => {
 		page = await program.navigateTo('/uni_modules/uni-id-pages/pages/userinfo/userinfo')
 		await page.waitFor(500)
-		console.log("program.pageStack: ", await program.pageStack());
+		console.log(await program.pageStack());
+		uniToken = await page.data('uniToken')
+		console.log("uniToken: ",uniToken);
 	});
 
 	it("昵称", async () => {
-		const nickname = "数字天堂DCloud" + Math.round(Math.random() * 10);
-		await page.waitFor(300)
-		await page.callMethod("setNickname", nickname)
+		if(uniToken){
+			const nickname = "数字天堂DCloud" + Math.round(Math.random() * 10);
+			await page.waitFor(300)
+			await page.callMethod("setNickname", nickname)
+		}
+		
 	})
 	
 	it("头像", async () => {
@@ -27,9 +32,9 @@ describe('uni_modules/uni-id-pages/pages/userinfo/userinfo.vue', () => {
 		}
 		console.log("avatar_file: ",avatar_file);
 		
-		if (process.env.UNI_PLATFORM != "mp-weixin") {
+		if (uniToken && process.env.UNI_PLATFORM != "mp-weixin") {
 			const elBox = await page.$('.box')
-			console.log("elBox: ",elBox);
+			// console.log("elBox: ",elBox);
 			await elBox.callMethod('setAvatarFile',avatar_file)
 		}else{
 			await page.waitFor(500)

uni_modules/uni-id-pages/pages/userinfo/userinfo.vue

@@ -58,7 +58,8 @@
 				// 	nickname:''
 				// },
 				hasPwd:false,
-				showLoginManage:false//通过页面传参隐藏登录&退出登录按钮
+				showLoginManage:false,//通过页面传参隐藏登录&退出登录按钮
+				uniToken:''
 			}
 		},
 		async onShow() {
@@ -73,6 +74,10 @@
 			let res = await uniIdCo.getAccountInfo()
 			this.hasPwd = res.isPasswordSet
 		},
+		onReady() {
+			this.uniToken = uni.getStorageSync('uni_id_token')
+			console.log("uniToken: ----", this.uniToken);
+		},
 		methods: {
 			login() {
 				uni.navigateTo({