diff --git a/main.js b/main.js index 6019751de22012d93d299f3125b946535dd9ae51..d1ed13d10076e9786ea6f9e701962acd6c7cc46f 100644 --- a/main.js +++ b/main.js @@ -3,7 +3,7 @@ import App from './App' // #ifndef VUE3 import Vue from 'vue' Vue.config.productionTip = false - +//自动化测试 uni.showModal = ()=>{}; App.mpType = 'app' diff --git a/pages/clientDB/demo/demo.test.js b/pages/clientDB/demo/demo.test.js index 6fc685c1f81c7aec5be3cd5f390c0067fbc2806b..cb8ac15780a9e0e896580b8c564bb6a59e128f5f 100644 --- a/pages/clientDB/demo/demo.test.js +++ b/pages/clientDB/demo/demo.test.js @@ -2,8 +2,7 @@ describe('pages/clientDB/demo/demo.vue', () => { let page,perPage,roles; beforeAll(async () => { // 重新reLaunch至首页,并获取首页page对象(其中 program 是uni-automator自动注入的全局对象) - page = await program.reLaunch( - '/pages/clientDB/demo/demo') + page = await program.reLaunch('/pages/clientDB/demo/demo') await page.waitFor("view") perPage = await page.$('.page') //底部角色控制条 diff --git a/pages/clientDB/unicloud-db-demo/unicloud-db-demo.test.js b/pages/clientDB/unicloud-db-demo/unicloud-db-demo.test.js index a832d5ffeb8f0a1f383753e4e0c407b5f2b69402..4f9c389dfaeed9869181f30737f5b6f9f97db0b4 100644 --- a/pages/clientDB/unicloud-db-demo/unicloud-db-demo.test.js +++ b/pages/clientDB/unicloud-db-demo/unicloud-db-demo.test.js @@ -64,26 +64,23 @@ describe('pages/clientDB/unicloud-db-demo/unicloud-db-demo', () => { //改变分页策略为add // const pageCheckbox = await page.$('.page-checkbox') await page.setData({"pageData": "add"}) - // console.log('pageData---add: ',await page.data('pageData')); - const isAdd = await page.waitFor(async()=>{ - const addText = await page.data('pageData') - return addText === 'add' - }) - if(isAdd){//加载更多 - /* if (process.env.UNI_PLATFORM === "mp-weixin") { - const toLoadMore = await page.$('.toLoadMore') - const loadMore = await toLoadMore.$('.loadMore') - await loadMore.tap() - await page.waitFor(300) - } */ - if (process.env.UNI_PLATFORM === "h5" || process.env.UNI_PLATFORM.startsWith("app")) { - const loadMore = await page.$('.loadMore') - // console.log('loadMore: ',loadMore); - // await page.waitFor(300) - await loadMore.tap() - await page.waitFor(300) - } + console.log('pageData---: ',await page.data('pageData')); + await page.waitFor(1000) + + //加载更多 + /* if (process.env.UNI_PLATFORM === "mp-weixin") { + const toLoadMore = await page.$('.toLoadMore') + const loadMore = await toLoadMore.$('.loadMore') + await loadMore.tap() + await page.waitFor(300) + } */ + if (process.env.UNI_PLATFORM === "h5" || process.env.UNI_PLATFORM.startsWith("app")) { + const loadMore = await page.$('.loadMore') + console.log('loadMore: ',loadMore); + await loadMore.tap() + await page.waitFor(300) } + //每页数据数量减去1 const pageSizeSubBefore = await page.data('pageSize') const numBox2 = await page.$('.num-box2') diff --git a/pages/schema2code/schema2code.test.js b/pages/schema2code/schema2code.test.js index 982a73d02547089001f4de2a8eb49b60519226f1..17776e019a17f540842f007fdec12b3174b1aa2c 100644 --- a/pages/schema2code/schema2code.test.js +++ b/pages/schema2code/schema2code.test.js @@ -3,25 +3,12 @@ describe('pages/schema2code/schema2code.nvue', () => { 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') }) }) diff --git a/pages/schema2code/schema2code.vue b/pages/schema2code/schema2code.vue index 715b90c9438423fa4266f3bc86d9e76a48a56adb..a83593b7782c1afc6e3df37b30cb42d412119660 100644 --- a/pages/schema2code/schema2code.vue +++ b/pages/schema2code/schema2code.vue @@ -1,107 +1,102 @@ \ No newline at end of file diff --git a/pages/user-info/add.test.js b/pages/user-info/add.test.js index 4af264655fd7f0c24f6b8b266a6e19048c01ce16..3d36b0897b70f56238920bd5891961ecd6a21aaf 100644 --- a/pages/user-info/add.test.js +++ b/pages/user-info/add.test.js @@ -10,6 +10,7 @@ describe('pages/user-info/add.vue', () => { // 重新reLaunch至首页,并获取首页page对象(其中 program 是uni-automator自动注入的全局对象) page = await program.reLaunch('/pages/user-info/add') await page.waitFor('view') + await page.setData({'isTest':true}) }) it('输入表单内容', async () => { await page.setData({ @@ -30,5 +31,6 @@ describe('pages/user-info/add.vue', () => { "isTest": true }) await page.callMethod('submit') + await page.waitFor(1000) }) }) \ No newline at end of file diff --git a/pages/user-info/add.vue b/pages/user-info/add.vue index bad592d50bb2e30e79d9f655d872850c369cdcd4..83449a795f5baff1fb0380ebbf6460ffb803b372 100644 --- a/pages/user-info/add.vue +++ b/pages/user-info/add.vue @@ -23,19 +23,23 @@ - + - + - + - + @@ -45,7 +49,9 @@ \ No newline at end of file diff --git a/pages/user-info/edit.test.js b/pages/user-info/edit.test.js index fba5ec25a550b0670518cf04884d8cf237914f41..5a9cdabfb12c509aa7b3b5e3a424dc47a6eb486a 100644 --- a/pages/user-info/edit.test.js +++ b/pages/user-info/edit.test.js @@ -10,7 +10,9 @@ describe('pages/user-info/detail.vue', () => { // 重新reLaunch至首页,并获取首页page对象(其中 program 是uni-automator自动注入的全局对象) // page = await program.navigateTo('/pages/user-info/edit?id=601d044ac9e7be0001cc00b8') page = await program.currentPage() - await page.waitFor('view') + console.log('page: ', page); + await page.waitFor('view') + await page.setData({'isTest':true}) getQuery = await page.query console.log('getQuery: ', getQuery); if (Object.keys(getQuery).length === 0 || getQuery === undefined) { diff --git a/pages/user-info/edit.vue b/pages/user-info/edit.vue index 8f34a5128efab1709e2fafcd720cfc71b475f90f..5987471eafcadc03cdb10f8fba815af5d8fec88d 100644 --- a/pages/user-info/edit.vue +++ b/pages/user-info/edit.vue @@ -23,19 +23,23 @@ - + - + - + - + @@ -45,7 +49,9 @@