test: improve testing utils (#629)

huozhi · Jan 11, 2025 · 88452bf · 88452bf
1 parent c58adce
commit 88452bf
Show file tree

Hide file tree

Showing 93 changed files with 235 additions and 212 deletions.
diff --git a/package.json b/package.json
@@ -119,8 +119,7 @@
       "node_modules"
     ],
     "moduleNameMapper": {
-      "^bunchee$": "<rootDir>/src/index.ts",
-      "^testing-utils$": "<rootDir>/test/integration/utils.ts"
+      "^bunchee$": "<rootDir>/src/index.ts"
     },
     "transform": {
       "^.+\\.(t|j)sx?$": [

diff --git a/test/typing.test.ts → src/typing.test.ts b/test/typing.test.ts → src/typing.test.ts
@@ -1,5 +1,5 @@
 // Import from generated files instead of using tsconfig alias
-import { bundle, type BundleConfig } from 'bunchee'
+import { bundle, type BundleConfig } from './index'
 
 describe('types', () => {
   it('should be able to import the node API and use correct typings', async () => {

diff --git a/test/unit/exports.regacy-test.ts → test/_legacy/exports.test.txt b/test/unit/exports.regacy-test.ts → test/_legacy/exports.test.txt
diff --git a/test/cli/basic/index.test.ts b/test/cli/basic/index.test.ts
@@ -1,5 +1,5 @@
 import fs from 'fs'
-import { createCliTest } from '../utils'
+import { createCliTest } from '../../testing-utils'
 
 describe('cli', () => {
   it(`cli basic should work properly`, async () => {

diff --git a/test/cli/cjs-relative-imports/index.test.ts b/test/cli/cjs-relative-imports/index.test.ts
@@ -1,5 +1,5 @@
 import fs from 'fs'
-import { createCliTest } from '../utils'
+import { createCliTest } from '../../testing-utils'
 
 describe('cli', () => {
   it(`cli cjs-relative-imports should work properly`, async () => {

diff --git a/test/cli/dts-bundle/index.test.ts b/test/cli/dts-bundle/index.test.ts
@@ -1,8 +1,7 @@
 import fs from 'fs'
 import fsp from 'fs/promises'
 import { join } from 'path'
-import { createCliTest } from '../utils'
-import { deleteFile } from '../../testing-utils'
+import { createCliTest, deleteFile } from '../../testing-utils'
 
 describe('cli', () => {
   const dir = __dirname

diff --git a/test/cli/dts/index.test.ts b/test/cli/dts/index.test.ts
@@ -1,6 +1,6 @@
 import fs from 'fs'
 import path from 'path'
-import { createCliTest } from '../utils'
+import { createCliTest } from '../../testing-utils'
 
 describe('cli', () => {
   it(`cli dts should work properly`, async () => {

diff --git a/test/cli/env-var/index.test.ts b/test/cli/env-var/index.test.ts
@@ -1,5 +1,5 @@
 import fs from 'fs'
-import { createCliTest } from '../utils'
+import { createCliTest } from '../../testing-utils'
 
 describe('cli', () => {
   it(`cli env-var should work properly`, async () => {

diff --git a/test/cli/externals/index.test.ts b/test/cli/externals/index.test.ts
@@ -1,5 +1,5 @@
 import fs from 'fs'
-import { createCliTest } from '../utils'
+import { createCliTest } from '../../testing-utils'
 
 describe('cli', () => {
   it(`cli external should work properly`, async () => {

diff --git a/test/cli/no-dts/index.test.ts b/test/cli/no-dts/index.test.ts
@@ -1,6 +1,6 @@
 import fs from 'fs'
 import path from 'path'
-import { createCliTest } from '../utils'
+import { createCliTest } from '../../testing-utils'
 
 describe('cli', () => {
   it(`cli no-dts option should work properly`, async () => {

diff --git a/test/cli/no-entry/index.test.ts b/test/cli/no-entry/index.test.ts
@@ -1,4 +1,4 @@
-import { createCliTest } from '../utils'
+import { createCliTest } from '../../testing-utils'
 
 describe('cli', () => {
   it(`cli no-entry should work properly`, async () => {

diff --git a/test/cli/output-in-watch/index.test.ts b/test/cli/output-in-watch/index.test.ts
@@ -1,4 +1,4 @@
-import { createCliTest } from '../utils'
+import { createCliTest } from '../../testing-utils'
 
 describe('cli', () => {
   it(`cli output-in-watch should work properly`, async () => {

diff --git a/test/cli/target/index.test.ts b/test/cli/target/index.test.ts
@@ -1,5 +1,5 @@
 import fs from 'fs'
-import { createCliTest } from '../utils'
+import { createCliTest } from '../../testing-utils'
 
 describe('cli', () => {
   it(`cli es2020-target should work properly`, async () => {

diff --git a/test/cli/workspace/index.test.ts b/test/cli/workspace/index.test.ts
@@ -1,5 +1,5 @@
 import fs from 'fs'
-import { createCliTest } from '../utils'
+import { createCliTest } from '../../testing-utils'
 import path from 'path'
 
 describe('cli', () => {

diff --git a/test/fixtures/integration-test-template/index.test.ts b/test/fixtures/integration-test-template/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest, assertContainFiles } from 'testing-utils'
+import { createIntegrationTest, assertContainFiles } from '../../testing-utils'
 
 describe('integration - <name>', () => {
   it('should work', async () => {

diff --git a/test/integration/basic-jsx/index.test.ts b/test/integration/basic-jsx/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest, assertContainFiles } from '../utils'
+import { createIntegrationTest, assertContainFiles } from '../../testing-utils'
 
 describe('integration basic-jsx', () => {
   it('should work with basic JSX format', async () => {

diff --git a/test/integration/bin/cts/index.test.ts b/test/integration/bin/cts/index.test.ts
@@ -1,4 +1,7 @@
-import { assertFilesContent, createIntegrationTest } from '../../utils'
+import {
+  assertFilesContent,
+  createIntegrationTest,
+} from '../../../testing-utils'
 
 describe('integration bin/cts', () => {
   it('should work with bin as .cts extension', async () => {

diff --git a/test/integration/bin/multi-path/index.test.ts b/test/integration/bin/multi-path/index.test.ts
@@ -2,7 +2,7 @@ import {
   assertFilesContent,
   createIntegrationTest,
   isWindows,
-} from '../../utils'
+} from '../../../testing-utils'
 
 describe('integration bin/multi-path', () => {
   // TODO: handle the transform error on windows

diff --git a/test/integration/bin/patch-binary/index.test.ts b/test/integration/bin/patch-binary/index.test.ts
@@ -2,7 +2,7 @@ import {
   createIntegrationTest,
   assertContainFiles,
   assertFilesContent,
-} from '../../utils'
+} from '../../../testing-utils'
 
 describe('integration bin/patch-binary', () => {
   it('should patch binary directive', async () => {

diff --git a/test/integration/bin/single-path/index.test.ts b/test/integration/bin/single-path/index.test.ts
@@ -4,7 +4,7 @@ import {
   assertFilesContent,
   getFileNamesFromDirectory,
   isWindows,
-} from '../../utils'
+} from '../../../testing-utils'
 
 describe('integration bin/single-path', () => {
   // TODO: handle the transform error on windows

diff --git a/test/integration/browserslist/index.test.ts b/test/integration/browserslist/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest, assertFilesContent } from '../utils'
+import { createIntegrationTest, assertFilesContent } from '../../testing-utils'
 
 describe('browserslist', () => {
   it('should work with basic JSX format', async () => {

diff --git a/test/integration/conflicted-entry/conflicted-entry.test.ts b/test/integration/conflicted-entry/conflicted-entry.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest } from '../utils'
+import { createIntegrationTest } from '../../testing-utils'
 
 describe('integration - conflicted-entry', () => {
   it('should error on conflicted entries', async () => {

diff --git a/test/integration/default-node-mjs/index.test.ts b/test/integration/default-node-mjs/index.test.ts
@@ -1,5 +1,5 @@
 import { readFile } from 'fs/promises'
-import { createIntegrationTest, existsFile } from '../utils'
+import { createIntegrationTest, existsFile } from '../../testing-utils'
 
 describe('integration default-node-mjs', () => {
   it('should work with .mjs extension', async () => {

diff --git a/test/integration/dev-prod-convention-reexport/index.test.ts b/test/integration/dev-prod-convention-reexport/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest, assertFilesContent } from '../utils'
+import { createIntegrationTest, assertFilesContent } from '../../testing-utils'
 
 describe('integration dev-prod-convention-reexport', () => {
   it('should work with dev and prod optimize conditions', async () => {

diff --git a/test/integration/dev-prod-convention/index.test.ts b/test/integration/dev-prod-convention/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest, assertFilesContent } from '../utils'
+import { createIntegrationTest, assertFilesContent } from '../../testing-utils'
 
 describe('integration dev-prod-convention', () => {
   it('should work with dev and prod optimize conditions', async () => {

diff --git a/test/integration/dev-prod-nested-convention/index.test.ts b/test/integration/dev-prod-nested-convention/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest, assertFilesContent } from '../utils'
+import { createIntegrationTest, assertFilesContent } from '../../testing-utils'
 
 describe('integration dev-prod-nested-convention', () => {
   it('should work with dev and prod optimize conditions', async () => {

diff --git a/test/integration/dev-prod-special-convention/index.test.ts b/test/integration/dev-prod-special-convention/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest, assertFilesContent } from '../utils'
+import { createIntegrationTest, assertFilesContent } from '../../testing-utils'
 
 describe('integration dev-prod-special-convention', () => {
   it('should work with dev prod and special optimize conditions', async () => {

diff --git a/test/integration/duplicate-entries-partial-specified/index.test.ts b/test/integration/duplicate-entries-partial-specified/index.test.ts
@@ -1,4 +1,7 @@
-import { createIntegrationTest, getFileNamesFromDirectory } from '../utils'
+import {
+  createIntegrationTest,
+  getFileNamesFromDirectory,
+} from '../../testing-utils'
 
 describe('integration duplicate-entries-partial-specified', () => {
   it('should not generate js types paths if not specified', async () => {

diff --git a/test/integration/dynamic-require/dynamic-require.test.ts b/test/integration/dynamic-require/dynamic-require.test.ts
@@ -1,5 +1,8 @@
 import fs from 'fs'
-import { createIntegrationTest, getFileNamesFromDirectory } from '../utils'
+import {
+  createIntegrationTest,
+  getFileNamesFromDirectory,
+} from '../../testing-utils'
 
 describe('integration - dynamic-require', () => {
   it('should work', async () => {

diff --git a/test/integration/edge-variable/index.test.ts b/test/integration/edge-variable/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest, assertFilesContent } from '../utils'
+import { createIntegrationTest, assertFilesContent } from '../../testing-utils'
 
 describe('integration edge-variable', () => {
   it('should work with edge export condition', async () => {

diff --git a/test/integration/entry-index-index/index.test.ts b/test/integration/entry-index-index/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest, assertFilesContent } from '../utils'
+import { createIntegrationTest, assertFilesContent } from '../../testing-utils'
 
 describe('integration entry-index-index', () => {
   it('should work with index file inside index directory', async () => {

diff --git a/test/integration/esm-pkg-cjs-main-field/index.test.ts b/test/integration/esm-pkg-cjs-main-field/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest, assertContainFiles } from '../utils'
+import { createIntegrationTest, assertContainFiles } from '../../testing-utils'
 
 describe('integration esm-pkg-cjs-main-field', () => {
   it('should work with ESM package with CJS main field ', async () => {

diff --git a/test/integration/esm-shims/index.test.ts b/test/integration/esm-shims/index.test.ts
@@ -2,7 +2,7 @@ import {
   createIntegrationTest,
   assertFilesContent,
   getFileContents,
-} from '../utils'
+} from '../../testing-utils'
 
 describe('integration esm-shims', () => {
   it('should work with ESM shims', async () => {

diff --git a/test/integration/externals/index.test.ts b/test/integration/externals/index.test.ts
@@ -1,5 +1,5 @@
 import { readFile } from 'fs/promises'
-import { createIntegrationTest } from '../utils'
+import { createIntegrationTest } from '../../testing-utils'
 
 describe('integration externals', () => {
   it('should handle externals', async () => {

diff --git a/test/integration/import-fallback/index.test.ts b/test/integration/import-fallback/index.test.ts
@@ -1,5 +1,5 @@
 import { readFile } from 'fs/promises'
-import { createIntegrationTest } from '../utils'
+import { createIntegrationTest } from '../../testing-utils'
 
 describe('integration import fallback', () => {
   it('should handle import fallback', async () => {

diff --git a/test/integration/js-bad-configured-types/index.test.ts b/test/integration/js-bad-configured-types/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest } from '../utils'
+import { createIntegrationTest } from '../../testing-utils'
 
 describe('integration js-bad-configured-types', () => {
   it('should error when types is not correctly configured', async () => {

diff --git a/test/integration/js-only/index.test.ts b/test/integration/js-only/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest, existsFile } from '../utils'
+import { createIntegrationTest, existsFile } from '../../testing-utils'
 
 describe('integration js-only', () => {
   beforeEach(() => {

diff --git a/test/integration/lint/cjs-pkg-esm-main-field/index.test.ts b/test/integration/lint/cjs-pkg-esm-main-field/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest } from '../../utils'
+import { createIntegrationTest } from '../../../testing-utils'
 
 describe('integration cjs-pkg-esm-main-field', () => {
   it('should warn if main field with .mjs extension in CJS package', async () => {

diff --git a/test/integration/lint/invalid-exports-cjs/index.test.ts b/test/integration/lint/invalid-exports-cjs/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest } from '../../utils'
+import { createIntegrationTest } from '../../../testing-utils'
 
 describe('integration invalid-exports-cjs', () => {
   it('should warn on invalid exports as CJS', async () => {

diff --git a/test/integration/lint/invalid-exports-esm/index.test.ts b/test/integration/lint/invalid-exports-esm/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest } from '../../utils'
+import { createIntegrationTest } from '../../../testing-utils'
 
 describe('integration invalid-exports-esm', () => {
   it('should warn on invalid exports as ESM', async () => {

diff --git a/test/integration/lint/missing-files-exports/index.test.ts b/test/integration/lint/missing-files-exports/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest } from '../../utils'
+import { createIntegrationTest } from '../../../testing-utils'
 
 describe('integration - lint - missing-files-exports', () => {
   it('should warn on missing files', async () => {

diff --git a/test/integration/lint/missing-files-main/index.test.ts b/test/integration/lint/missing-files-main/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest } from '../../utils'
+import { createIntegrationTest } from '../../../testing-utils'
 
 describe('integration - lint - missing-files-main', () => {
   it('should warn on missing files', async () => {

diff --git a/test/integration/lint/single-entry/index.test.ts b/test/integration/lint/single-entry/index.test.ts
@@ -3,7 +3,7 @@ import {
   assertFilesContent,
   stripANSIColor,
 } from '../../../testing-utils'
-import { createIntegrationTest } from '../../utils'
+import { createIntegrationTest } from '../../../testing-utils'
 
 describe('integration single-entry', () => {
   it('should warn on invalid exports as CJS', async () => {

diff --git a/test/integration/mixed-directives/mixed-directives.test.ts b/test/integration/mixed-directives/mixed-directives.test.ts
@@ -1,5 +1,8 @@
 import { readFileSync } from 'fs'
-import { createIntegrationTest, getFileNamesFromDirectory } from '../utils'
+import {
+  createIntegrationTest,
+  getFileNamesFromDirectory,
+} from '../../testing-utils'
 
 describe('integration - mixed-directives', () => {
   it('should work with js only project', async () => {

diff --git a/test/integration/monorepo-composite-no-incremental/index.test.ts b/test/integration/monorepo-composite-no-incremental/index.test.ts
@@ -1,5 +1,5 @@
 import { join } from 'path'
-import { assertContainFiles, createIntegrationTest } from '../utils'
+import { assertContainFiles, createIntegrationTest } from '../../testing-utils'
 
 describe('integration monorepo-composite-no-incremental', () => {
   it('should succeed the build', async () => {

diff --git a/test/integration/monorepo-composite/index.test.ts b/test/integration/monorepo-composite/index.test.ts
@@ -1,5 +1,5 @@
 import { join } from 'path'
-import { assertContainFiles, createIntegrationTest } from '../utils'
+import { assertContainFiles, createIntegrationTest } from '../../testing-utils'
 
 describe('integration monorepo-composite', () => {
   it('should succeed the build', async () => {

diff --git a/test/integration/multi-entries/index.test.ts b/test/integration/multi-entries/index.test.ts
@@ -3,7 +3,7 @@ import {
   createIntegrationTest,
   getChunkFileNamesFromLog,
   stripANSIColor,
-} from '../utils'
+} from '../../testing-utils'
 
 describe('integration multi-entries', () => {
   it('should contain files', async () => {

diff --git a/test/integration/multi-exports-ts/index.test.ts b/test/integration/multi-exports-ts/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegration, assertFilesContent } from '../utils'
+import { createIntegration, assertFilesContent } from '../../testing-utils'
 
 describe('integration multi-exports', () => {
   const { dir } = createIntegration({

diff --git a/test/integration/multi-types/index.test.ts b/test/integration/multi-types/index.test.ts
@@ -3,7 +3,7 @@ import {
   createIntegrationTest,
   getChunkFileNamesFromLog,
   stripANSIColor,
-} from '../utils'
+} from '../../testing-utils'
 
 describe('integration multi-types', () => {
   it('should contain files', async () => {

diff --git a/test/integration/nested-exports/index.test.ts b/test/integration/nested-exports/index.test.ts
@@ -1,4 +1,4 @@
-import { assertFilesContent, createIntegrationTest } from '../utils'
+import { assertFilesContent, createIntegrationTest } from '../../testing-utils'
 
 describe('integration nested-exports', () => {
   it('should work with nested path in exports', async () => {

diff --git a/test/integration/no-clean/index.test.ts b/test/integration/no-clean/index.test.ts
@@ -5,7 +5,7 @@ import {
   assertContainFiles,
   assertFilesContent,
   createIntegration,
-} from '../utils'
+} from '../../testing-utils'
 import { existsSync } from 'fs'
 
 describe('integration - no-clean flag', () => {

diff --git a/test/integration/node-mixed-legacy-modern-entries/index.test.ts b/test/integration/node-mixed-legacy-modern-entries/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest, assertContainFiles } from '../utils'
+import { createIntegrationTest, assertContainFiles } from '../../testing-utils'
 
 describe('node-mixed-legacy-modern-entries', () => {
   it('should deduplicate entries', async () => {

diff --git a/test/integration/output-short/index.test.ts b/test/integration/output-short/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest, stripANSIColor } from '../utils'
+import { createIntegrationTest, stripANSIColor } from '../../testing-utils'
 
 const getOutputSizeColumnIndex = (line: string): number => {
   let match

diff --git a/test/integration/output/index.test.ts b/test/integration/output/index.test.ts
@@ -1,4 +1,4 @@
-import { createIntegrationTest, stripANSIColor } from '../utils'
+import { createIntegrationTest, stripANSIColor } from '../../testing-utils'
 
 const getOutputSizeColumnIndex = (line: string): number => {
   let match

diff --git a/test/integration/pkg-exports-default/index.test.ts b/test/integration/pkg-exports-default/index.test.ts
@@ -1,6 +1,6 @@
 import { promises as fsp } from 'fs'
 import { join } from 'path'
-import { assertContainFiles, createIntegrationTest } from '../utils'
+import { assertContainFiles, createIntegrationTest } from '../../testing-utils'
 
 describe('integration pkg-exports-default', () => {
   it('should generate proper assets with js', async () => {

diff --git a/test/integration/pkg-exports-js/index.test.ts b/test/integration/pkg-exports-js/index.test.ts
@@ -1,4 +1,4 @@
-import { assertContainFiles, createIntegrationTest } from '../utils'
+import { assertContainFiles, createIntegrationTest } from '../../testing-utils'
 
 describe('integration pkg-exports-js', () => {
   it('should generate proper assets with js', async () => {

diff --git a/test/integration/pkg-exports-ts-rsc/index.test.ts b/test/integration/pkg-exports-ts-rsc/index.test.ts
@@ -1,4 +1,4 @@
-import { assertFilesContent, createIntegrationTest } from '../utils'
+import { assertFilesContent, createIntegrationTest } from '../../testing-utils'
 
 describe('integration pkg-exports-ts-rsc', () => {
   it('should generate proper assets for rsc condition with ts', async () => {