修改写法+下掉promise单测逻辑

didi · Sep 27, 2023 · cb533a0 · cb533a0
1 parent 8e074da
commit cb533a0
Show file tree

Hide file tree

Showing 38 changed files with 86 additions and 343 deletions.
diff --git a/jest.config.json b/jest.config.json
@@ -7,8 +7,7 @@
   },
   "testEnvironment": "jsdom",
   "testMatch": [
-    "**/packages/core/**/?(*.)+(spec|test).[jt]s?(x)",
-    "**/packages/webpack-plugin/**/?(*.)+(spec|test).[jt]s?(x)"
+    "**/packages/**/?(*.)+(spec|test).[jt]s?(x)"
   ],
   "testPathIgnorePatterns": ["dist", "node_modules"]
 }
diff --git a/packages/api-proxy/__tests__/web/action-sheet.spec.js b/packages/api-proxy/__tests__/web/action-sheet.spec.js
@@ -2,20 +2,6 @@ import '@testing-library/jest-dom/extend-expect'
 import {
   showActionSheet
 } from '../../src/platform/api/action-sheet/index.web'
-import mpx from '../../../core/src/index'
-import apiProxy from '../../src/index'
-mpx.use(apiProxy, {
-  usePromise: true
-})
-
-// function manualPromise (promise, execResolve, execReject) {
-//   return new Promise((resolve, reject) => {
-//     console.log(promise(), '&&&')
-//     promise().then(res => resolve(res)).catch(err => reject(err))
-//     execResolve && execResolve()
-//     execReject && execReject()
-//   })
-// }
 
 describe('test toast', () => {
   afterAll(() => {
@@ -91,41 +77,4 @@ describe('test toast', () => {
       errMsg: 'showActionSheet:fail cancel'
     })
   })
-
-  test('should exec promise then', () => {
-    const execResolve = () => {
-      const actionSheet = document.body.lastChild
-      const list = actionSheet.lastChild.firstChild
-      list.childNodes[2].click()
-    }
-
-    mpx.showActionSheet({
-      itemList: ['A', 'B', 'C']
-    }).then(res => {
-      expect(res).toEqual({
-        errMsg: 'showActionSheet:ok',
-        tapIndex: 2
-      })
-      execResolve()
-    })
-  })
-
-  test('should exec promise catch', () => {
-    const execReject = () => {
-      const actionSheet = document.body.lastChild
-      const cancelBtn = actionSheet.lastChild.lastChild
-      cancelBtn.click()
-    }
-
-    // return manualPromise(() => {
-    mpx.showActionSheet({
-      itemList: ['A', 'B', 'C']
-    }).catch(err => {
-      expect(err).toEqual({
-        errMsg: 'showActionSheet:fail cancel'
-      })
-      execReject()
-    })
-    // }, null, execReject)
-  })
 })
diff --git a/packages/api-proxy/__tests__/web/install.spec.js b/packages/api-proxy/__tests__/web/install.spec.js
diff --git a/packages/api-proxy/__tests__/web/modal.spec.js b/packages/api-proxy/__tests__/web/modal.spec.js
@@ -4,20 +4,6 @@ import {
   showModal
 } from '../../src/platform/api/modal/index.web'
 
-import mpx from '../../../core/src/index'
-import apiProxy from '../../src/index'
-mpx.use(apiProxy, {
-  usePromise: true
-})
-
-// function manualPromise (promise, execResolve, execReject) {
-//   return new Promise((resolve, reject) => {
-//     promise().then(res => resolve(res)).catch(err => reject(err))
-//     execResolve && execResolve()
-//     execReject && execReject()
-//   })
-// }
-
 describe('test modal', () => {
   afterAll(() => {
     document.body.lastChild.remove()
@@ -76,26 +62,4 @@ describe('test modal', () => {
       confirm: true
     })
   })
-  test('should exec promise then', () => {
-    const execResolve = () => {
-      const modal = document.body.lastChild
-      const box = modal.lastChild
-      const btns = box.lastChild
-      const confirmBtn = btns.lastChild
-      confirmBtn.click()
-    }
-
-    // return manualPromise(() => {
-    mpx.showModal({
-      title: 'promise'
-    }).then(res => {
-      expect(res).toEqual({
-        errMsg: 'showModal:ok',
-        cancel: false,
-        confirm: true
-      })
-      execResolve()
-    })
-    // }, execResolve)
-  })
 })
diff --git a/packages/api-proxy/__tests__/web/storage.spec.js b/packages/api-proxy/__tests__/web/storage.spec.js
@@ -9,11 +9,7 @@ import {
   clearStorage,
   clearStorageSync
 } from '../../src/platform/api/storage/index.web'
-import mpx from '../../../core/src/index'
-import apiProxy from '../../src/index'
-mpx.use(apiProxy, {
-  usePromise: true
-})
+
 const storageKey = 'storage key'
 const storageValue = 'storage value'
 const storageSyncKey = 'storage sync key'
@@ -50,15 +46,6 @@ describe('test storage', () => {
     expect(complete.mock.calls.length).toBe(1)
   })
 
-  test('setStorage promise then', () => {
-    mpx.setStorage({
-      key: storageSyncKey,
-      data: storageSyncValue
-    }).then(res => {
-      expect(res).toEqual({ errMsg: 'setStorage:ok' })
-    })
-  })
-
   test('getStorage', () => {
     const success = jest.fn()
     const fail = jest.fn()
@@ -77,14 +64,6 @@ describe('test storage', () => {
     expect(complete.mock.calls.length).toBe(1)
   })
 
-  test('getStorage promise then', () => {
-    mpx.getStorage({
-      key: storageSyncKey
-    }).then(res => {
-      expect(res.data).toEqual(storageSyncValue)
-    })
-  })
-
   test('getStorageInfo', () => {
     const success = jest.fn()
     const fail = jest.fn()
@@ -102,12 +81,6 @@ describe('test storage', () => {
     expect(complete.mock.calls.length).toBe(1)
   })
 
-  test('getStorageInfo promise then', () => {
-    mpx.getStorageInfo().then(res => {
-      expect(res.keys).toEqual([storageKey, storageSyncKey])
-    })
-  })
-
   test('removeStorage', () => {
     const success = jest.fn()
     const fail = jest.fn()
@@ -126,14 +99,6 @@ describe('test storage', () => {
     expect(getStorageInfoSync()).toEqual({ keys: [storageSyncKey], limitSize: null, currentSize: null })
   })
 
-  test('removeStorage promise then', () => {
-    mpx.removeStorage({
-      key: storageKey
-    }).then(res => {
-      expect(res).toEqual({ errMsg: 'removeStorage:ok' })
-    })
-  })
-
   test('clearStorage', () => {
     const success = jest.fn()
     const fail = jest.fn()

diff --git a/packages/api-proxy/__tests__/web/toast.spec.js b/packages/api-proxy/__tests__/web/toast.spec.js
@@ -3,12 +3,6 @@ import {
   showToast, hideToast
 } from '../../src/platform/api/toast/index.web'
 
-import mpx from '../../../core/src/index'
-import apiProxy from '../../src/index'
-mpx.use(apiProxy, {
-  usePromise: true
-})
-
 describe('test toast', () => {
   afterAll(() => {
     document.body.lastChild.remove()
@@ -130,14 +124,4 @@ describe('test toast', () => {
     expect(success.mock.calls[0][0].errMsg).toBe('hideToast:ok')
     expect(complete.mock.calls.length).toBe(1)
   })
-
-  test('should exec showToast promise then', () => {
-    return mpx.showToast({
-      title: 'show'
-    }).then(res => {
-      expect(res).toEqual({
-        errMsg: 'showToast:ok'
-      })
-    })
-  })
 })
diff --git a/packages/api-proxy/api-proxy-resolver.js b/packages/api-proxy/api-proxy-resolver.js
diff --git a/packages/api-proxy/jest.config.json b/packages/api-proxy/jest.config.json
@@ -5,12 +5,6 @@
   "testEnvironment": "jsdom",
   "rootDir": "../",
   "moduleNameMapper": {
-    "\\.(css|styl)$": "identity-obj-proxy",
-    "^@mpxjs/(.*)$": "<rootDir>/$1"
-  },
-  "globals": {
-    "__mpx_mode__": "web",
-    "__mpx_env__": "web"
-  },
-  "resolver": "./api-proxy/api-proxy-resolver.js"
+    "\\.(css|styl)$": "identity-obj-proxy"
+  }
 }
diff --git a/packages/api-proxy/src/common/js/index.js b/packages/api-proxy/src/common/js/index.js
@@ -1,3 +1,2 @@
 export * from './web'
 export * from './utils'
-export * from './promisify'
diff --git a/packages/api-proxy/src/common/js/promisify.js b/packages/api-proxy/src/common/js/promisify.js
@@ -29,7 +29,8 @@ const blackList = [
   'reportMonitor',
   'createOffscreenCanvas',
   'reportEvent',
-  'connectSocket'
+  'connectSocket',
+  'base64ToArrayBuffer'
 ]
 
 function getMapFromList (list) {
@@ -97,4 +98,4 @@ function promisify (listObj, whiteList, customBlackList) {
   return result
 }
 
-export { promisify }
+export default promisify
diff --git a/packages/api-proxy/src/install.js b/packages/api-proxy/src/install.js
@@ -1,5 +1,6 @@
 import * as platformApi from './platform'
-import { getEnvObj, promisify } from './common/js'
+import { getEnvObj } from './common/js'
+import promisify from './common/js/promisify'
 
 export default function install (target, options = {}) {
   const {

diff --git a/packages/api-proxy/src/platform/api/action-sheet/index.ali.js b/packages/api-proxy/src/platform/api/action-sheet/index.ali.js
@@ -1,5 +1,4 @@
-import { changeOpts, getEnvObj, noop } from '../../../common/js'
-const ALI_OBJ = getEnvObj()
+import { changeOpts, noop } from '../../../common/js'
 function showActionSheet (options = {}) {
   const opts = changeOpts(options, {
     itemList: 'items'
@@ -21,7 +20,7 @@ function showActionSheet (options = {}) {
     }
   }
 
-  ALI_OBJ.showActionSheet(opts)
+  my.showActionSheet(opts)
 }
 
 export {

diff --git a/packages/api-proxy/src/platform/api/add-phone-contact/index.ali.js b/packages/api-proxy/src/platform/api/add-phone-contact/index.ali.js
@@ -1,13 +1,11 @@
-import { changeOpts, getEnvObj } from '../../../common/js'
-
-const ALI_OBJ = getEnvObj()
+import { changeOpts } from '../../../common/js'
 
 function addPhoneContact (options = {}) {
   const opts = changeOpts(options, {
     weChatNumber: 'alipayAccount'
   })
 
-  ALI_OBJ.addPhoneContact(opts)
+  my.addPhoneContact(opts)
 }
 
 export {

diff --git a/packages/api-proxy/src/platform/api/animation/index.js b/packages/api-proxy/src/platform/api/animation/index.js
@@ -2,12 +2,7 @@ import { getEnvObj, envError } from '../../../common/js'
 
 const ENV_OBJ = getEnvObj()
 
-function createAnimation (options = {}) {
-  if (!ENV_OBJ.createAnimation) {
-    return envError('createAnimation')()
-  }
-  return ENV_OBJ.createAnimation(options)
-}
+const createAnimation = ENV_OBJ.createAnimation || envError('createAnimation')
 
 export {
   createAnimation

diff --git a/packages/api-proxy/src/platform/api/audio/index.js b/packages/api-proxy/src/platform/api/audio/index.js
@@ -2,12 +2,7 @@ import { getEnvObj, envError } from '../../../common/js'
 
 const ENV_OBJ = getEnvObj()
 
-function createInnerAudioContext (options = {}) {
-  if (!ENV_OBJ.createInnerAudioContext) {
-    return envError('createInnerAudioContext')()
-  }
-  return ENV_OBJ.createInnerAudioContext(options)
-}
+const createInnerAudioContext = ENV_OBJ.createInnerAudioContext || envError('createInnerAudioContext')
 
 export {
   createInnerAudioContext

diff --git a/packages/api-proxy/src/platform/api/base/index.js b/packages/api-proxy/src/platform/api/base/index.js
@@ -2,19 +2,9 @@ import { getEnvObj, envError } from '../../../common/js'
 
 const ENV_OBJ = getEnvObj()
 
-function base64ToArrayBuffer (base64) {
-  if (!ENV_OBJ.base64ToArrayBuffer) {
-    return envError('base64ToArrayBuffer')()
-  }
-  return ENV_OBJ.base64ToArrayBuffer(base64)
-}
+const base64ToArrayBuffer = ENV_OBJ.base64ToArrayBuffer || envError('base64ToArrayBuffer')
 
-function arrayBufferToBase64 (arrayBuffer) {
-  if (!ENV_OBJ.arrayBufferToBase64) {
-    return envError('arrayBufferToBase64')()
-  }
-  return ENV_OBJ.arrayBufferToBase64(arrayBuffer)
-}
+const arrayBufferToBase64 = ENV_OBJ.arrayBufferToBase64 || envError('arrayBufferToBase64')
 
 export {
   base64ToArrayBuffer,

diff --git a/packages/api-proxy/src/platform/api/ble-connection/index.ali.js b/packages/api-proxy/src/platform/api/ble-connection/index.ali.js
@@ -1,17 +1,13 @@
-import { getEnvObj } from '../../../common/js'
-
-const ALI_OBJ = getEnvObj()
-
 function closeBLEConnection (options = {}) {
-  ALI_OBJ.disconnectBLEDevice(options)
+  my.disconnectBLEDevice(options)
 }
 
 function createBLEConnection (options = {}) {
-  ALI_OBJ.connectBLEDevice(options)
+  my.connectBLEDevice(options)
 }
 
 function onBLEConnectionStateChange (callback) {
-  ALI_OBJ.onBLEConnectionStateChanged(callback)
+  my.onBLEConnectionStateChanged(callback)
 }
 
 export {