test: avoid potential output conflict (#481)

web-infra-dev · Nov 27, 2024 · 8ef44bc · 8ef44bc
1 parent 00c0d3a
commit 8ef44bc
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 32 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/integration/cli/build.test.ts → tests/integration/cli/build/build.test.ts b/tests/integration/cli/build.test.ts → tests/integration/cli/build/build.test.ts
@@ -15,8 +15,8 @@ describe('build command', async () => {
     const fileNames = Object.keys(files).sort();
     expect(fileNames).toMatchInlineSnapshot(`
       [
-        "<ROOT>/tests/integration/cli/dist/cjs/index.cjs",
-        "<ROOT>/tests/integration/cli/dist/esm/index.js",
+        "<ROOT>/tests/integration/cli/build/dist/cjs/index.cjs",
+        "<ROOT>/tests/integration/cli/build/dist/esm/index.js",
       ]
     `);
   });
@@ -31,7 +31,7 @@ describe('build command', async () => {
     const fileNames = Object.keys(files).sort();
     expect(fileNames).toMatchInlineSnapshot(`
       [
-        "<ROOT>/tests/integration/cli/dist/esm/index.js",
+        "<ROOT>/tests/integration/cli/build/dist/esm/index.js",
       ]
     `);
   });
@@ -46,8 +46,8 @@ describe('build command', async () => {
     const fileNames = Object.keys(files).sort();
     expect(fileNames).toMatchInlineSnapshot(`
       [
-        "<ROOT>/tests/integration/cli/dist/cjs/index.cjs",
-        "<ROOT>/tests/integration/cli/dist/esm/index.js",
+        "<ROOT>/tests/integration/cli/build/dist/cjs/index.cjs",
+        "<ROOT>/tests/integration/cli/build/dist/esm/index.js",
       ]
     `);
   });
@@ -65,15 +65,14 @@ describe('build command', async () => {
     const fileNames = Object.keys(files).sort();
     expect(fileNames).toMatchInlineSnapshot(`
       [
-        "<ROOT>/tests/integration/cli/dist/custom/index.cjs",
-        "<ROOT>/tests/integration/cli/dist/custom/index.js",
+        "<ROOT>/tests/integration/cli/build/dist/custom/index.cjs",
+        "<ROOT>/tests/integration/cli/build/dist/custom/index.js",
       ]
     `);
   });
 
   test('--root', async () => {
     await fse.remove(path.join(__dirname, 'dist'));
-    console.log('__dirname: ', __dirname);
     execSync('npx rslib build --root custom-root', {
       cwd: __dirname,
     });
@@ -82,8 +81,8 @@ describe('build command', async () => {
     const fileNames = Object.keys(files).sort();
     expect(fileNames).toMatchInlineSnapshot(`
       [
-        "<ROOT>/tests/integration/cli/dist/root/index.cjs",
-        "<ROOT>/tests/integration/cli/dist/root/index.js",
+        "<ROOT>/tests/integration/cli/build/dist/root/index.cjs",
+        "<ROOT>/tests/integration/cli/build/dist/root/index.js",
       ]
     `);
   });

diff --git a/.../cli/custom-config/rslib.config.custom.ts → ...uild/custom-config/rslib.config.custom.ts b/.../cli/custom-config/rslib.config.custom.ts → ...uild/custom-config/rslib.config.custom.ts
diff --git a/.../integration/cli/custom-root/package.json → ...ration/cli/build/custom-root/package.json b/.../integration/cli/custom-root/package.json → ...ration/cli/build/custom-root/package.json
diff --git a/...tegration/cli/custom-root/rslib.config.ts → ...ion/cli/build/custom-root/rslib.config.ts b/...tegration/cli/custom-root/rslib.config.ts → ...ion/cli/build/custom-root/rslib.config.ts
diff --git a/tests/integration/cli/package.json → tests/integration/cli/build/package.json b/tests/integration/cli/package.json → tests/integration/cli/build/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "cli-test",
+  "name": "cli-build-test",
   "version": "1.0.0",
   "private": true,
   "type": "module"

diff --git a/tests/integration/cli/rslib.config.ts → tests/integration/cli/build/rslib.config.ts b/tests/integration/cli/rslib.config.ts → tests/integration/cli/build/rslib.config.ts
diff --git a/tests/integration/cli/src/index.ts → tests/integration/cli/build/src/index.ts b/tests/integration/cli/src/index.ts → tests/integration/cli/build/src/index.ts
diff --git a/tests/integration/cli/inspect.test.ts → ...s/integration/cli/inspect/inspect.test.ts b/tests/integration/cli/inspect.test.ts → ...s/integration/cli/inspect/inspect.test.ts
@@ -16,13 +16,13 @@ describe('inspect command', async () => {
     const fileNames = Object.keys(files).sort();
 
     expect(fileNames).toMatchInlineSnapshot(`
-    [
-      "<ROOT>/tests/integration/cli/dist/.rsbuild/rsbuild.config.cjs.mjs",
-      "<ROOT>/tests/integration/cli/dist/.rsbuild/rsbuild.config.esm.mjs",
-      "<ROOT>/tests/integration/cli/dist/.rsbuild/rspack.config.cjs.mjs",
-      "<ROOT>/tests/integration/cli/dist/.rsbuild/rspack.config.esm.mjs",
-    ]
-  `);
+      [
+        "<ROOT>/tests/integration/cli/inspect/dist/.rsbuild/rsbuild.config.cjs.mjs",
+        "<ROOT>/tests/integration/cli/inspect/dist/.rsbuild/rsbuild.config.esm.mjs",
+        "<ROOT>/tests/integration/cli/inspect/dist/.rsbuild/rspack.config.cjs.mjs",
+        "<ROOT>/tests/integration/cli/inspect/dist/.rsbuild/rspack.config.esm.mjs",
+      ]
+    `);
 
     // esm rsbuild config
     const rsbuildConfigEsm = fileNames.find((item) =>
@@ -52,11 +52,11 @@ describe('inspect command', async () => {
 
     // Rsbuild will emit dump files to `dist/esm` if only one environment is specified.
     expect(fileNames).toMatchInlineSnapshot(`
-    [
-      "<ROOT>/tests/integration/cli/dist/esm/.rsbuild/rsbuild.config.mjs",
-      "<ROOT>/tests/integration/cli/dist/esm/.rsbuild/rspack.config.esm.mjs",
-    ]
-  `);
+      [
+        "<ROOT>/tests/integration/cli/inspect/dist/esm/.rsbuild/rsbuild.config.mjs",
+        "<ROOT>/tests/integration/cli/inspect/dist/esm/.rsbuild/rspack.config.esm.mjs",
+      ]
+    `);
 
     // esm rsbuild config
     const rsbuildConfigEsm = fileNames.find((item) =>
@@ -84,12 +84,12 @@ describe('inspect command', async () => {
 
     // Rsbuild will emit dump files to `dist/esm` if only one environment is specified.
     expect(fileNames).toMatchInlineSnapshot(`
-    [
-      "<ROOT>/tests/integration/cli/dist/.rsbuild/rsbuild.config.cjs.mjs",
-      "<ROOT>/tests/integration/cli/dist/.rsbuild/rsbuild.config.esm.mjs",
-      "<ROOT>/tests/integration/cli/dist/.rsbuild/rspack.config.cjs.mjs",
-      "<ROOT>/tests/integration/cli/dist/.rsbuild/rspack.config.esm.mjs",
-    ]
-  `);
+      [
+        "<ROOT>/tests/integration/cli/inspect/dist/.rsbuild/rsbuild.config.cjs.mjs",
+        "<ROOT>/tests/integration/cli/inspect/dist/.rsbuild/rsbuild.config.esm.mjs",
+        "<ROOT>/tests/integration/cli/inspect/dist/.rsbuild/rspack.config.cjs.mjs",
+        "<ROOT>/tests/integration/cli/inspect/dist/.rsbuild/rspack.config.esm.mjs",
+      ]
+    `);
   });
 });
diff --git a/tests/integration/cli/inspect/package.json b/tests/integration/cli/inspect/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "cli-inspect-test",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module"
+}
diff --git a/tests/integration/cli/inspect/rslib.config.ts b/tests/integration/cli/inspect/rslib.config.ts
@@ -0,0 +1,6 @@
+import { defineConfig } from '@rslib/core';
+import { generateBundleCjsConfig, generateBundleEsmConfig } from 'test-helper';
+
+export default defineConfig({
+  lib: [generateBundleEsmConfig(), generateBundleCjsConfig()],
+});
diff --git a/tests/integration/cli/inspect/src/index.ts b/tests/integration/cli/inspect/src/index.ts
@@ -0,0 +1 @@
+export const foo = 'foo';