fix: 引崩溃问题移除自动化测试期间的弹框

pages/API/unicloud-call-function/unicloud-call-function.test.js

@@ -5,6 +5,9 @@ describe('unicloud-call-function', () => {
   beforeAll(async () => {
     page = await program.reLaunch(PAGE_PATH)
     await page.waitFor(500)
+    await page.setData({
+      isUniTest: true
+    })
   })
 
   it('callFunction', async () => {

pages/API/unicloud-call-function/unicloud-call-function.uvue

@@ -20,7 +20,8 @@
       return {
         title: '请求云函数',
         callFunctionResult: {},
-        callFunctionError: {}
+        callFunctionError: {},
+        isUniTest: false
       }
     },
     onLoad() {
@@ -28,6 +29,19 @@
     onUnload() {
     },
     methods: {
+      notify(content : string, title : string) {
+        if (!this.isUniTest) {
+          uni.showModal({
+            title,
+            content,
+            showCancel: false
+          })
+        } else {
+          uni.showToast({
+            title: content
+          })
+        }
+      },
       callFunction: function () {
         uni.showLoading({
           title: '加载中...'
@@ -43,23 +57,15 @@
           this.callFunctionResult = result
           console.log(JSON.stringify(result))
           uni.hideLoading()
-          uni.showModal({
-            title: '提示',
-            content: result['showMessage'] as string,
-            showCancel: false
-          })
-        }).catch<void>((err: any | null) => {
+          this.notify(result['showMessage'] as string, '提示')
+        }).catch<void>((err : any | null) => {
           const error = err as UniCloudError
           this.callFunctionError = {
             errCode: error.errCode,
             errMsg: error.errMsg
           }
           uni.hideLoading()
-          uni.showModal({
-            title: '错误',
-            content: error.errMsg,
-            showCancel: false
-          })
+          this.notify(error.errMsg, '错误')
         })
       }
     }

pages/API/unicloud-database/unicloud-database.test.js

@@ -5,6 +5,9 @@ describe('unicloud-database', () => {
   beforeAll(async () => {
     page = await program.reLaunch(PAGE_PATH)
     await page.waitFor(500)
+    await page.setData({
+      isUniTest: true
+    })
   })
   it('databaseBasic', async () => {
     await page.callMethod('dbRemove')

pages/API/unicloud-database/unicloud-database.uvue

@@ -34,6 +34,7 @@
         getWithCommandData: [] as Array<UTSJSONObject>,
         removeDeleted: 0,
         lookupData: [] as Array<UTSJSONObject>,
+        isUniTest: false
       }
     },
     onLoad() {
@@ -41,6 +42,19 @@
     onUnload() {
     },
     methods: {
+      notify(content : string, title : string) {
+        if (!this.isUniTest) {
+          uni.showModal({
+            title,
+            content,
+            showCancel: false
+          })
+        } else {
+          uni.showToast({
+            title: content
+          })
+        }
+      },
       dbAdd: function () {
         uni.showLoading({
           title: '加载中...'
@@ -57,19 +71,12 @@
             uni.hideLoading()
             console.log(res)
             this.addId = res.id
-            uni.showModal({
-              content: `新增成功，id: ${res.id}`,
-              showCancel: false
-            })
+            this.notify(`新增成功，id: ${res.id}`, '提示')
           })
           .catch<void>((err : any | null) => {
             uni.hideLoading()
             const error = err as UniCloudError
-            uni.showModal({
-              title: '错误',
-              content: error.errMsg,
-              showCancel: false
-            })
+            this.notify(error.errMsg, '错误')
           })
       },
       dbBatchAdd() {
@@ -88,21 +95,15 @@
           .then<void>((res) => {
             uni.hideLoading()
             console.log(res)
+            console.log('JSON.stringify(res.inserted)', JSON.stringify(res.inserted))
             this.batchAddIds = res.ids
             this.batchAddinserted = res.inserted
-            uni.showModal({
-              content: `新增成功条数${res.inserted}, id列表: ${res.ids.join(',')}`,
-              showCancel: false
-            })
+            this.notify(`新增成功条数${res.inserted}, id列表: ${res.ids.join(',')}`, '提示')
           })
           .catch<void>((err : any | null) => {
             uni.hideLoading()
             const error = err as UniCloudError
-            uni.showModal({
-              title: '错误',
-              content: error.errMsg,
-              showCancel: false
-            })
+            this.notify(error.errMsg, '错误')
           })
       },
       dbGet() {
@@ -123,19 +124,12 @@
             uni.hideLoading()
             console.log(res)
             this.getData = res.data
-            uni.showModal({
-              content: `获取成功，取到了${res.data.length}条数据`,
-              showCancel: false
-            })
+            this.notify(`获取成功，取到了${res.data.length}条数据`, '提示')
           })
           .catch<void>((err : any | null) => {
             uni.hideLoading()
             const error = err as UniCloudError
-            uni.showModal({
-              title: '错误',
-              content: error.errMsg,
-              showCancel: false
-            })
+            this.notify(error.errMsg, '错误')
           })
       },
       dbGetWithCommand() {
@@ -156,19 +150,12 @@
             uni.hideLoading()
             console.log(res)
             this.getWithCommandData = res.data
-            uni.showModal({
-              content: `获取成功，取到了${res.data.length}条数据`,
-              showCancel: false
-            })
+            this.notify(`获取成功，取到了${res.data.length}条数据`, '提示')
           })
           .catch<void>((err : any | null) => {
             uni.hideLoading()
             const error = err as UniCloudError
-            uni.showModal({
-              title: '错误',
-              content: error.errMsg,
-              showCancel: false
-            })
+            this.notify(error.errMsg, '错误')
           })
       },
       dbUpdate() {
@@ -187,19 +174,12 @@
             uni.hideLoading()
             console.log(res)
             this.updateUpdated = res.updated
-            uni.showModal({
-              content: `更新成功，更新了${res.updated}条数据`,
-              showCancel: false
-            })
+            this.notify(`更新成功，更新了${res.updated}条数据`, '提示')
           })
           .catch<void>((err : any | null) => {
             uni.hideLoading()
             const error = err as UniCloudError
-            uni.showModal({
-              title: '错误',
-              content: error.errMsg,
-              showCancel: false
-            })
+            this.notify(error.errMsg, '错误')
           })
       },
       dbRemove() {
@@ -216,19 +196,12 @@
             uni.hideLoading()
             console.log(res)
             this.removeDeleted = res.deleted
-            uni.showModal({
-              content: `删除成功，删掉了${res.deleted}条数据`,
-              showCancel: false
-            })
+            this.notify(`删除成功，删掉了${res.deleted}条数据`, '提示')
           })
           .catch<void>((err : any | null) => {
             uni.hideLoading()
             const error = err as UniCloudError
-            uni.showModal({
-              title: '错误',
-              content: error.errMsg,
-              showCancel: false
-            })
+            this.notify(error.errMsg, '错误')
           })
       },
       dbLookupInit() {
@@ -272,20 +245,13 @@
           })
           .then<void>((_) : void => {
             uni.hideLoading()
-            uni.showModal({
-              content: '数据初始化成功',
-              showCancel: false
-            })
+            this.notify('数据初始化成功', '提示')
           })
           .catch<void>((err : any | null) => {
             uni.hideLoading()
             console.error(err)
             const error = err as UniCloudError
-            uni.showModal({
-              title: '错误',
-              content: error.errMsg,
-              showCancel: false
-            })
+            this.notify(error.errMsg, '错误')
           })
       },
       dbLookup() {
@@ -305,19 +271,12 @@
             uni.hideLoading()
             console.log(res)
             this.lookupData = res.data
-            uni.showModal({
-              content: `联表查询成功，取到了${res.data.length}条数据`,
-              showCancel: false
-            })
+            this.notify(`联表查询成功，取到了${res.data.length}条数据`, '提示')
           })
           .catch<void>((err : any | null) => {
             uni.hideLoading()
             const error = err as UniCloudError
-            uni.showModal({
-              title: '错误',
-              content: error.errMsg,
-              showCancel: false
-            })
+            this.notify(error.errMsg, '错误')
           })
       }
     }

pages/API/unicloud-import-object/unicloud-import-object.test.js

@@ -5,6 +5,9 @@ describe('unicloud-import-object', () => {
   beforeAll(async () => {
     page = await program.reLaunch(PAGE_PATH)
     await page.waitFor(500)
+    await page.setData({
+      isUniTest: true
+    })
   })
   it('importObject', async () => {
     await page.callMethod('addTodo')

pages/API/unicloud-import-object/unicloud-import-object.uvue

@@ -34,22 +34,34 @@
         returnTodoTitle: '',
         returnTodoContent: '',
         failErrCode: '',
-        successErrCode: -1
+        successErrCode: -1,
+        isUniTest: false
       }
     },
     methods: {
+      notify(content : string, title : string) {
+        if (!this.isUniTest) {
+          uni.showModal({
+            title,
+            content,
+            showCancel: false
+          })
+        } else {
+          uni.showToast({
+            title: content
+          })
+        }
+      },
       addTodo() {
-        const todo = uniCloud.importObject('todo')
+        const todo = uniCloud.importObject('todo', {
+          customUI: this.isUniTest
+        })
         const title = this.todoTitle
         const content = this.todoContent
         todo.add(title, content).then<void>((res : UTSJSONObject) : void => {
           this.returnTodoTitle = res['title'] as string
           this.returnTodoContent = res['content'] as string
-          uni.showModal({
-            title: '提示',
-            content: res['showMessage'] as string,
-            showCancel: false
-          })
+          this.notify(res['showMessage'] as string, '提示')
         }).catch<void>((err : any | null) : void => {
           const error = err as UniCloudError
           console.error(error)
@@ -62,40 +74,37 @@
           }
         })
         todoObj.randomFail().then<void>((res : UTSJSONObject) : void => {
-          uni.showModal({
-            title: '提示',
-            content: res['showMessage'] as string,
-            showCancel: false
-          })
+          this.notify(res['showMessage'] as string, '提示')
         }).catch<void>((err : any | null) : void => {
           const error = err as UniCloudError
           console.error(error)
         })
       },
       fail() {
-        const todo = uniCloud.importObject('todo')
-        todo.fail().then<void>((res : UTSJSONObject) : void => {
-          uni.showModal({
-            title: '提示',
-            content: 'todo.fail应调用失败，此处错误的触发了成功回调',
-            showCancel: false
+        const todo = uniCloud.importObject('todo', {
+          customUI: this.isUniTest
         })
+        todo.fail().then<void>((res : UTSJSONObject) : void => {
+          this.notify('todo.fail应调用失败，此处错误的触发了成功回调', '错误')
           console.log('todo.fail: ', res);
         }).catch<void>((err : any | null) : void => {
           const error = err as UniCloudError
           this.failErrCode = error.errCode as string
           console.error(error)
+          if (this.isUniTest) {
+            uni.showToast({
+              title: err.errMsg
+            })
+          }
         })
       },
       success() {
-        const todo = uniCloud.importObject('todo')
+        const todo = uniCloud.importObject('todo', {
+          customUI: this.isUniTest
+        })
         todo.success().then<void>((res : UTSJSONObject) : void => {
           this.successErrCode = res['errCode'] as number
-          uni.showModal({
-            title: '提示',
-            content: res['showMessage'] as string,
-            showCancel: false
-          })
+          this.notify(res['showMessage'] as string, '提示')
         }).catch<void>((err : any | null) : void => {
           const error = err as UniCloudError
           console.error(error)