test: 优化测试例

pages/clientDB/permission-table-compound/permission-table-compound.test.js

+jest.setTimeout(20000)
+
 describe('pages/clientDB/permission-table-compound/permission-table-compound.vue', () => {
 	let page,errMsgA,errMsgB,perPage,segItems,roles;
 	beforeAll(async () => {
@@ -398,9 +400,6 @@ describe('pages/clientDB/permission-table-compound/permission-table-compound.vue
 			"index": 1,
 			"action": "add_view_count"
 		})
-
-
-
 	})
 
 

pages/clientDB/validate/validate.test.js

@@ -13,7 +13,7 @@ describe('pages/clientDB/validate/validate.vue', () => {
 		const segmentedControl = await page.$('.segmented-control')
 		const seControl = await segmentedControl.$$('.segmented-control__item')
 		// console.log(await seControl[0].text());
-		expect(await seControl[0].text()).toBe('实例demo')
+		expect((await seControl[0].text()).trim()).toBe('实例demo')
 		await seControl[1].tap()
 		await page.waitFor(300)
 		await seControl[2].tap()

pages/schema2code/schema2code.test.js

 describe('pages/schema2code/schema2code.nvue', () => {
-	
-	let page
-	beforeAll(async () => {
-	    // 重新reLaunch至首页，并获取首页page对象（其中 program 是uni-automator自动注入的全局对象）
-	    page = await program.switchTab('/pages/schema2code/schema2code')
-	    await page.waitFor('view')
-	})
-	
-	it('schema2code-点击',async()=>{
-		const title = await page.$('.uni-title')
-		const showSchemaCode = await title.$('.showSchemaCode')
-		await showSchemaCode.tap()
-		await page.waitFor(300)
-		// const showSchemaCode = await page.callMethod('showSchemaCode')
-	})
-	
-	
-	it('前往生成的云端一体页面',async()=>{
-		const toForm = await page.$('.toForm')
-		await toForm.tap()
-		await page.waitFor(1000)
-		// expect( (await program.currentPage()).path).toBe('pages/user-info/list')
-		// await page.waitFor(500) 
-		// //返回navigateBack 验证是否返回
-		// expect((await program.navigateBack()).path).toBe('pages/schema2code/schema2code')
-	})
-	
-})
+  let page
+  beforeAll(async () => {
+    // 重新reLaunch至首页，并获取首页page对象（其中 program 是uni-automator自动注入的全局对象）
+    page = await program.reLaunch('/pages/schema2code/schema2code')
+    await page.setData({ isTest: true })
+    await page.waitFor('view')
+  })
+
+  it('schema2code-点击', async () => {
+    const title = await page.$('.uni-title')
+    const showSchemaCode = await title.$('.showSchemaCode')
+    await showSchemaCode.tap()
+    await page.waitFor(300)
+    // const showSchemaCode = await page.callMethod('showSchemaCode')
+  })
+
+  it('前往生成的云端一体页面', async () => {
+    const toForm = await page.$('.toForm')
+    await toForm.tap()
+    await page.waitFor(1000)
+    // expect( (await program.currentPage()).path).toBe('pages/user-info/list')
+    // await page.waitFor(500)
+    // //返回navigateBack 验证是否返回
+    // expect((await program.navigateBack()).path).toBe('pages/schema2code/schema2code')
+  })
+})
\ No newline at end of file

pages/schema2code/schema2code.vue

-<template>
-    <view class="root">
-		<view class="uni-title dashed-box">
-			<text class="tip">
-				schema2code是一个根据数据库schema自动生成代码的工具。它可以直接生成云端一体的列表、详情、新建、修改页面，云端一体直接可用。大幅提升开发效率。
-			</text>
-			<text>\n schema路径:uniCloud/database/user-info.schema.json \n</text>
-			<button class="showSchemaCode" size="mini" @click="showSchemaCode" type="primary" plain>查看schema代码</button>
-		</view>
-		<j-video :src="videoUrl" title="schema2code步骤演示" height="421rpx" width="750rpx"></j-video>
-		<alertCode ref="alertCode"></alertCode>
-		<button class="toForm" @click="toForm" type="primary" size="mini" plain>前往生成的云端一体页面</button>
-    </view>
-</template>
-
-<script>
-import schemaCode from './schemaCode';
-    export default {
-        data() {
-            return {
-				schemaCode:schemaCode,
-				videoUrl:"https://web-assets.dcloud.net.cn/unidoc/zh/schema2code%E7%9A%84%E4%B8%A4%E7%A7%8D%E6%96%B9%E5%BC%8F.mp4",
-				// https://web-assets.dcloud.net.cn/unidoc/zh/create-schema2code-video.mp4
-            }
-        },
-        methods: {
-			async showSchemaCode(){
-				return this.$refs.alertCode.open(schemaCode)
-			},
-			toForm(){
-				uni.navigateTo({
-					url:'../user-info/list'
-				})
-			}
-        }
-    }
-</script>
-
-<style scoped>
-.code-view{
-	height:750rpx;
-	width: 750rpx;
-	padding:5px 8px;
-	overflow: scroll;
-	background-color:#fffae7;
-}
-.code-box{
-    white-space:nowrap;
-	color: #447315;
-	font-size: 12px;
-}
-.root{
-	flex-direction: column;
-}
-.dashed-box{
-	border: dashed 1px #EEEEEE;
-	border-radius: 5px;
-	width: 750rpx;
-	position: relative;
-}
-.uni-title {
-	width: 680rpx;
-	margin: 15rpx;
-	font-size:26rpx;
-	padding:20rpx;
-	line-height:1.5;
-	background-color: #FFFFFF;
-}
-.uni-title text{
-	font-size:24rpx;
-	color:#888;
-}
-.toForm{
-	width: 500rpx;
-	margin:30px 125rpx;
-}
-.uni-title text.link{
-	color: #586b95;
-}
-text.tip{
-	background-color: #FFFFFF;
-	color: #333;
-	height: 80px;
-	width: 750rpx;
-}
-.showSchemaCode{
-	margin-top: 10px;
-}
-</style>
+<template>
+	<view class="root">
+		<view class="uni-title dashed-box">
+			<text class="tip">
+				schema2code是一个根据数据库schema自动生成代码的工具。它可以直接生成云端一体的列表、详情、新建、修改页面，云端一体直接可用。大幅提升开发效率。
+			</text>
+			<text>\n schema路径:uniCloud/database/user-info.schema.json \n</text>
+			<button class="showSchemaCode" size="mini" @click="showSchemaCode" type="primary" plain>查看schema代码</button>
+		</view>
+		<j-video v-if="showVideo" :src="videoUrl" title="schema2code步骤演示" height="421rpx" width="750rpx"></j-video>
+		<alertCode ref="alertCode"></alertCode>
+		<button class="toForm" @click="toForm" type="primary" size="mini" plain>前往生成的云端一体页面</button>
+	</view>
+</template>
+
+<script>
+	import schemaCode from './schemaCode';
+	export default {
+		data() {
+			return {
+				schemaCode: schemaCode,
+				videoUrl: "https://web-assets.dcloud.net.cn/unidoc/zh/schema2code%E7%9A%84%E4%B8%A4%E7%A7%8D%E6%96%B9%E5%BC%8F.mp4",
+				// https://web-assets.dcloud.net.cn/unidoc/zh/create-schema2code-video.mp4,
+				showVideo: false,
+				isTest: false
+			}
+		},
+		onReady() {
+			setTimeout(() => {
+				if(!this.isTest){
+					this.showVideo = true;
+				}
+			},1000)
+		},
+		methods: {
+			async showSchemaCode() {
+				return this.$refs.alertCode.open(schemaCode)
+			},
+			toForm() {
+				uni.navigateTo({
+					url: '../user-info/list'
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.code-view {
+		height: 750rpx;
+		width: 750rpx;
+		padding: 5px 8px;
+		overflow: scroll;
+		background-color: #fffae7;
+	}
+
+	.code-box {
+		white-space: nowrap;
+		color: #447315;
+		font-size: 12px;
+	}
+
+	.root {
+		flex-direction: column;
+	}
+
+	.dashed-box {
+		border: dashed 1px #EEEEEE;
+		border-radius: 5px;
+		width: 750rpx;
+		position: relative;
+	}
+
+	.uni-title {
+		width: 680rpx;
+		margin: 15rpx;
+		font-size: 26rpx;
+		padding: 20rpx;
+		line-height: 1.5;
+		background-color: #FFFFFF;
+	}
+
+	.uni-title text {
+		font-size: 24rpx;
+		color: #888;
+	}
+
+	.toForm {
+		width: 500rpx;
+		margin: 30px 125rpx;
+	}
+
+	.uni-title text.link {
+		color: #586b95;
+	}
+
+	text.tip {
+		background-color: #FFFFFF;
+		color: #333;
+		height: 80px;
+		width: 750rpx;
+	}
+
+	.showSchemaCode {
+		margin-top: 10px;
+	}
+</style>
\ No newline at end of file