@tarojs/taro-rn 3.4.3 → 3.4.6

package/src/__tests__/storage.test.js

@@ -63,7 +63,7 @@ describe('storage', () => {
         fail,
         complete
       }).catch(err => {
-        const expectErrMsg = err.message
+        const expectErrMsg = err.errMsg
         expect(fail.mock.calls.length).toBe(1)
         expect(fail.mock.calls[0][0]).toEqual({ errMsg: expectErrMsg })
         expect(complete.mock.calls.length).toBe(1)

package/src/__tests__/system.test.js

@@ -7,8 +7,8 @@ describe('system', () => {
   describe('getSystemInfoSync', () => {
     test('能同步返回正确的系统信息', () => {
       const expectRes = {
-        brand: null,
-        model: null,
+        brand: expect.any(String),
+        model: expect.any(String),
         pixelRatio: expect.any(Number),
         safeArea: expect.any(Object),
         screenWidth: expect.any(Number),
@@ -17,8 +17,8 @@ describe('system', () => {
         windowHeight: expect.any(Number),
         statusBarHeight: expect.any(Number),
         language: null,
-        version: null,
-        system: undefined,
+        version: expect.any(String),
+        system: expect.any(String),
         platform: expect.any(String),
         fontSizeSetting: expect.any(Number),
         SDKVersion: null
@@ -35,8 +35,8 @@ describe('system', () => {
       const fail = jest.fn()
       const complete = jest.fn()
       const expectRes = {
-        brand: null,
-        model: null,
+        brand: expect.any(String),
+        model: expect.any(String),
         pixelRatio: expect.any(Number),
         safeArea: expect.any(Object),
         screenWidth: expect.any(Number),
@@ -45,8 +45,8 @@ describe('system', () => {
         windowHeight: expect.any(Number),
         statusBarHeight: expect.any(Number),
         language: null,
-        version: null,
-        system: undefined,
+        version: expect.any(String),
+        system: expect.any(String),
         platform: expect.any(String),
         fontSizeSetting: expect.any(Number),
         SDKVersion: null

package/src/lib/Mask.tsx

@@ -12,6 +12,7 @@ const styles = StyleSheet.create({
 const Mask: React.FC<any> = ({ transparent = false, style, onPress, children }) =>
   <TouchableWithoutFeedback onPress={onPress}>
     <View
+      accessibilityLabel='mask'
       style={[styles.mask, { backgroundColor: transparent ? 'transparent' : 'rgba(0,0,0,.6)' }, style]}
     >
       <TouchableWithoutFeedback>{children}</TouchableWithoutFeedback>

package/src/lib/Popup.tsx

@@ -34,7 +34,7 @@ class Popup extends Component<any, any> {
 
   constructor (props:Props) {
     super(props)
-    this.state = { visible: false, translateY: new Animated.Value(height) }
+    this.state = { visible: props.visible ?? false, translateY: new Animated.Value(height) }
     this.handleLayout = this.handleLayout.bind(this)
   }
 

package/src/lib/connectSocket/index.ts

@@ -25,7 +25,6 @@ export function connectSocket(opts: Taro.connectSocket.Option): Promise<Taro.Soc
     if (socketTasks.length >= 2) {
       const error = new Error('同时最多发起 2 个 socket 请求，更多请参考文档。')
       res.errMsg = error.message
-      console.error(res.errMsg)
       fail?.(res)
       complete?.(res)
       return reject(res)

package/src/lib/request/index.ts

@@ -34,9 +34,9 @@ function _request<T = any>(options: Taro.request.Option): Taro.RequestTask<T> {
   } else {
     if (typeof data === 'object') {
       const contentType = options.header && (options.header['content-type'] || options.header['Content-Type'])
-      if (contentType === 'application/json') {
+      if (contentType.startsWith('application/json')) {
         data = JSON.stringify(data)
-      } else if (contentType === 'application/x-www-form-urlencoded') {
+      } else if (contentType.startsWith('application/x-www-form-urlencoded')) {
         data = serializeParams(data)
       }
     }
@@ -53,7 +53,7 @@ function _request<T = any>(options: Taro.request.Option): Taro.RequestTask<T> {
   params.method = method
   let controller
   // eslint-disable-next-line no-undef
-  if (AbortController) {
+  if (typeof(AbortController) !== 'undefined' ) {
     // eslint-disable-next-line no-undef
     controller = new AbortController()
     const signal = controller.signal

package/src/lib/scanCode/index.tsx

@@ -182,7 +182,7 @@ export async function scanCode(option: Taro.scanCode.Option = {}): Promise<Taro.
           style={{ width, height }}
           ratio='16:9'
         />
-        <TouchableOpacity style={styles.closeIcon} onPress={() => hide(scannerView)}>
+        <TouchableOpacity accessibilityLabel="Close" style={styles.closeIcon} onPress={() => hide(scannerView)}>
           {safeViewWrapper(<Image source={iconClose} style={styles.closeImg}/>)}
         </TouchableOpacity>
         {!onlyFromCamera && (<TouchableOpacity style={styles.albumIcon} onPress={() => {

package/src/setup.ts

@@ -0,0 +1,71 @@
+import { jest } from '@jest/globals'
+import '@testing-library/jest-native/extend-expect'
+import mockRNCNetInfo from '@react-native-community/netinfo/jest/netinfo-mock.js'
+import { NetInfoStateType } from '@react-native-community/netinfo'
+import mockRNCAsyncStorage from '@react-native-async-storage/async-storage/jest/async-storage-mock.js'
+import mockRNCDeviceInfo from 'react-native-device-info/jest/react-native-device-info-mock'
+
+jest.doMock('@react-native-community/netinfo', () => ({ ...mockRNCNetInfo, NetInfoStateType }))
+jest.doMock('@react-native-async-storage/async-storage', () => mockRNCAsyncStorage)
+jest.doMock('react-native-device-info', () => mockRNCDeviceInfo)
+
+jest.doMock('react-native', () => {
+  const ReactNative = jest.requireActual('react-native') as any
+
+  // Vibration readonly so you need use defineProperty rewrite this property descriptor.
+  const Vibration = (jest.requireActual('./__tests__/__mock__/mockVibrate') as any).default
+  Object.defineProperty(ReactNative, 'Vibration', {
+    enumerable: false,
+    configurable: false,
+    writable: false,
+    value: Vibration
+  })
+
+  // mockNativeModules: react-native/Libraries/BatchedBridge/NativeModules
+  const RNCCameraRoll = (jest.requireActual('./__tests__/__mock__/mockRNCCameraRoll') as any).default
+  const MockClipboard = (jest.requireActual('./__tests__/__mock__/mockClipboard') as any).default
+  const RNCGeolocation = (jest.requireActual('./__tests__/__mock__/mockRNCGeolocation') as any).default
+  ReactNative.NativeModules.RNCCameraRoll = RNCCameraRoll
+  ReactNative.NativeModules.RNCClipboard = new MockClipboard()
+  ReactNative.NativeModules.RNCGeolocation = RNCGeolocation
+  Object.defineProperty(ReactNative.NativeModules, 'ImageLoader', {
+    configurable: true,
+    enumerable: true,
+    get: () => ({
+      prefetchImage: jest.fn(),
+      getSize: jest.fn((_uri, success: any) => {
+        process.nextTick(() => success && success(320, 240))
+        return Promise.resolve([320, 240])
+      }),
+    }),
+  })
+  return ReactNative
+})
+
+jest.doMock('@unimodules/core', () => {
+  const unimodules = jest.requireActual('@unimodules/core') as any
+  const permisson = jest.requireActual('./__tests__/__mock__/mockExpoPermissions')
+  const { NativeModulesProxy } = unimodules
+
+  NativeModulesProxy.ExpoLocation = {
+    getCurrentPositionAsync: jest.fn(() => Promise.resolve({
+      coords: {
+        latitude: 0,
+        longitude: 0,
+        speed: 0,
+        accuracy: 0,
+        altitude: 0
+      }
+    }))
+  }
+  NativeModulesProxy.ExpoPermissions = permisson
+
+  return unimodules
+})
+
+jest.doMock('react-native-unimodules', () => {
+  const unimodules = jest.requireActual('react-native-unimodules') as any
+  const permisson = jest.requireActual('./__tests__/__mock__/mockExpoPermissions')
+  unimodules.Permissions = permisson
+  return unimodules
+})