Merge pull request #371 from caoyang818/release-3.6.8-app

fix: 还原代码rootPath以及优化单元测试代码
NervJS · Nov 1, 2023 · 7b9ed9a · 7b9ed9a
2 parents 24b7257 + 5605540
commit 7b9ed9a
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 13 deletions.
diff --git a/packages/taro-cli-convertor/__tests__/index.test.ts b/packages/taro-cli-convertor/__tests__/index.test.ts
@@ -3,11 +3,6 @@ import * as taroize from '@tarojs/taroize'
 import Convertor from '../src/index'
 import { generateMinimalEscapeCode } from './util'
 
-jest.mock('../src/util/index.ts', () => ({
-  ...jest.requireActual('../src/util/index.ts'), // 保留原始的其他函数
-  printToLogFile: jest.fn(),
-}))
-
 jest.mock('fs', () => ({
   ...jest.requireActual('fs'), // 保留原始的其他函数
   appendFile: jest.fn(),

diff --git a/packages/taro-cli-convertor/__tests__/script.test.ts b/packages/taro-cli-convertor/__tests__/script.test.ts
@@ -7,11 +7,6 @@ import { generateMinimalEscapeCode } from './util'
 const fs = require('fs')
 const path = require('path')
 
-jest.mock('../src/util/index.ts', () => ({
-  ...jest.requireActual('../src/util/index.ts'), // 保留原始的其他函数
-  printToLogFile: jest.fn(),
-}))
-
 jest.mock('fs', () => ({
   ...jest.requireActual('fs'), // 保留原始的其他函数
   appendFile: jest.fn(),

diff --git a/packages/taroize/__tests__/event.test.ts b/packages/taroize/__tests__/event.test.ts
@@ -6,6 +6,11 @@ interface Option {
   path: string
 }
 
+jest.mock('fs', () => ({
+  ...jest.requireActual('fs'), // 保留原始的其他函数
+  appendFile: jest.fn(),
+}))
+
 describe('event convertor', () => {
   const option: Option = {
     path: '',

diff --git a/packages/taroize/__tests__/script.test.ts b/packages/taroize/__tests__/script.test.ts
@@ -4,6 +4,10 @@ import { parseScript } from '../src/script'
 import { parseWXML, WXS } from '../src/wxml'
 import { generateMinimalEscapeCode } from './util'
 
+jest.mock('fs', () => ({
+  ...jest.requireActual('fs'), // 保留原始的其他函数
+  appendFile: jest.fn(),
+}))
 
 interface Option {
   script: string

diff --git a/packages/taroize/__tests__/template.test.ts b/packages/taroize/__tests__/template.test.ts
@@ -1,10 +1,14 @@
 import { parseWXML } from '../src/wxml'
 import { generateMinimalEscapeCode } from './util'
 
-jest.mock('fs')
 const fs = require('fs')
 const path = require('path')
 
+jest.mock('fs', () => ({
+  ...jest.requireActual('fs'), // 保留原始的其他函数
+  appendFile: jest.fn(),
+}))
+
 describe('template.ts', () => {
   describe('import 正常情况', () => {
     // 还原模拟函数

diff --git a/packages/taroize/__tests__/wxml.test.ts b/packages/taroize/__tests__/wxml.test.ts
@@ -3,6 +3,11 @@ import * as t from '@babel/types'
 import { convertStyleUnit, parseContent, parseStyle, parseWXML } from '../src/wxml'
 import { generateMinimalEscapeCode } from './util'
 
+jest.mock('fs', () => ({
+  ...jest.requireActual('fs'), // 保留原始的其他函数
+  appendFile: jest.fn(),
+}))
+
 interface Option {
   path: string
   rootPath: string

diff --git a/packages/taroize/src/global.ts b/packages/taroize/src/global.ts
@@ -3,13 +3,15 @@ export const usedComponents = new Set<string>()
 export const errors: string[] = []
 
 export const globals = {
+  rootPath: '',
   hasCatchTrue: false,
   logFilePath: '',
 }
 
 export const THIRD_PARTY_COMPONENTS = new Set<string>()
 
-export const resetGlobals = (logFilePath) => {
+export const resetGlobals = (rootPath, logFilePath) => {
+  globals.rootPath = rootPath
   globals.hasCatchTrue = false
   globals.logFilePath = logFilePath
   THIRD_PARTY_COMPONENTS.clear()

diff --git a/packages/taroize/src/index.ts b/packages/taroize/src/index.ts
@@ -19,7 +19,7 @@ interface Option {
 }
 
 export function parse (option: Option) {
-  resetGlobals(option.logFilePath)
+  resetGlobals(option.rootPath, option.logFilePath)
   setting.rootPath = option.rootPath
   if (option.json) {
     const config = JSON.parse(option.json)