@nocobase/test 0.18.0-alpha.9 → 0.19.0-alpha.2

package/lib/e2e/defineConfig.js

@@ -33,7 +33,7 @@ const defineConfig = /* @__PURE__ */ __name((config) => {
     // Match all test files in the e2e and __e2e__ directories.
     testMatch: /(.*\/e2e\/|.*\/__e2e__\/).+\.test\.[tj]sx*$/,
     // Run all tests in parallel.
-    fullyParallel: true,
+    fullyParallel: false,
     // Fail the build on CI if you accidentally left test.only in the source code.
     forbidOnly: !!process.env.CI,
     // Retry on CI only.
@@ -41,7 +41,7 @@ const defineConfig = /* @__PURE__ */ __name((config) => {
     // Opt out of parallel tests on CI.
     // workers: process.env.CI ? 1 : undefined,
     workers: 1,
-    maxFailures: 1,
+    maxFailures: 0,
     // Reporter to use
     reporter: process.env.PLAYWRIGHT_SKIP_REPORTER ? void 0 : [["html", { outputFolder: "./storage/playwright/tests-report" }]],
     outputDir: "./storage/playwright/test-results",

package/lib/server/index.d.ts

@@ -3,6 +3,7 @@ export { mockDatabase } from '@nocobase/database';
 export { default as supertest } from 'supertest';
 export * from './mockServer';
 export declare const pgOnly: () => any;
+export declare const isPg: () => boolean;
 export declare function randomStr(): string;
 export declare const waitSecond: (timeout?: number) => Promise<void>;
 export declare const startServerWithRandomPort: (startServer: any) => Promise<unknown>;

package/lib/server/index.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var server_exports = {};
 __export(server_exports, {
   createWsClient: () => createWsClient,
+  isPg: () => isPg,
   mockDatabase: () => import_database.mockDatabase,
   pgOnly: () => pgOnly,
   randomStr: () => randomStr,
@@ -44,6 +45,7 @@ var import_database = require("@nocobase/database");
 var import_supertest = __toESM(require("supertest"));
 __reExport(server_exports, require("./mockServer"), module.exports);
 const pgOnly = /* @__PURE__ */ __name(() => process.env.DB_DIALECT == "postgres" ? import_vitest.describe : import_vitest.describe.skip, "pgOnly");
+const isPg = /* @__PURE__ */ __name(() => process.env.DB_DIALECT == "postgres", "isPg");
 function randomStr() {
   return Math.random().toString(36).substring(2);
 }
@@ -92,6 +94,7 @@ const createWsClient = /* @__PURE__ */ __name(async ({ serverPort, options = {}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createWsClient,
+  isPg,
   mockDatabase,
   pgOnly,
   randomStr,

package/lib/server/mockServer.d.ts

@@ -63,5 +63,12 @@ export declare class MockServer extends Application {
     };
 }
 export declare function mockServer(options?: ApplicationOptions): MockServer;
-export declare function createMockServer(): void;
+export declare function startMockServer(options?: ApplicationOptions): Promise<MockServer>;
+type BeforeInstallFn = (app: any) => Promise<void>;
+export declare function createMockServer(options?: ApplicationOptions & {
+    version?: string;
+    beforeInstall?: BeforeInstallFn;
+    skipInstall?: boolean;
+    skipStart?: boolean;
+}): Promise<MockServer>;
 export default mockServer;

package/lib/server/mockServer.js

@@ -31,7 +31,8 @@ __export(mockServer_exports, {
   MockServer: () => MockServer,
   createMockServer: () => createMockServer,
   default: () => mockServer_default,
-  mockServer: () => mockServer
+  mockServer: () => mockServer,
+  startMockServer: () => startMockServer
 });
 module.exports = __toCommonJS(mockServer_exports);
 var import_database = require("@nocobase/database");
@@ -159,7 +160,6 @@ function mockServer(options = {}) {
     global.TextDecoder = require("util").TextDecoder;
   }
   import_server.Gateway.getInstance().reset();
-  import_server.AppSupervisor.getInstance().reset();
   if (!import_server.PluginManager.findPackagePatched) {
     import_server.PluginManager.getPackageJson = async () => {
       return {
@@ -175,7 +175,28 @@ function mockServer(options = {}) {
   return app;
 }
 __name(mockServer, "mockServer");
-function createMockServer() {
+async function startMockServer(options = {}) {
+  const app = mockServer(options);
+  await app.runCommand("start");
+  return app;
+}
+__name(startMockServer, "startMockServer");
+async function createMockServer(options = {}) {
+  const { version, beforeInstall, skipInstall, skipStart, ...others } = options;
+  const app = mockServer(others);
+  if (!skipInstall) {
+    if (beforeInstall) {
+      await beforeInstall(app);
+    }
+    await app.runCommand("install", "-f");
+  }
+  if (version) {
+    await app.version.update(version);
+  }
+  if (!skipStart) {
+    await app.runCommand("start");
+  }
+  return app;
 }
 __name(createMockServer, "createMockServer");
 var mockServer_default = mockServer;
@@ -183,5 +204,6 @@ var mockServer_default = mockServer;
 0 && (module.exports = {
   MockServer,
   createMockServer,
-  mockServer
+  mockServer,
+  startMockServer
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/test",
-  "version": "0.18.0-alpha.9",
+  "version": "0.19.0-alpha.2",
   "main": "lib/index.js",
   "module": "./src/index.ts",
   "types": "./lib/index.d.ts",
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@faker-js/faker": "8.1.0",
-    "@nocobase/server": "0.18.0-alpha.9",
+    "@nocobase/server": "0.19.0-alpha.2",
     "@playwright/test": "^1.40.1",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.4.3",
@@ -60,5 +60,5 @@
     "vitest-dom": "^0.1.1",
     "ws": "^8.13.0"
   },
-  "gitHead": "34ca0df4eede2e83fc86297b0fe19eba970e2b1b"
+  "gitHead": "cff5b77ecf12ccdb450d50d505b3aa44a68478c8"
 }

package/vitest.mjs

@@ -48,70 +48,71 @@ export const defineConfig = (config = {}) => {
   return vitestConfig(
     process.env.TEST_ENV === 'server-side'
       ? {
-        root: process.cwd(),
-        resolve: {
-          mainFields: ['module'],
-        },
-        test: {
-          globals: true,
-          setupFiles: resolve(__dirname, './setup/server.ts'),
-          alias: tsConfigPathsToAlias(),
-          include: ['packages/**/__tests__/**/*.test.ts'],
-          exclude: [
-            '**/node_modules/**',
-            '**/dist/**',
-            '**/lib/**',
-            '**/es/**',
-            '**/e2e/**',
-            '**/__e2e__/**',
-            '**/{vitest,commitlint}.config.*',
-            'packages/**/{dumi-theme-nocobase,sdk,client}/**/__tests__/**/*.{test,spec}.{ts,tsx}',
-          ],
-          testTimeout: 300000,
-          bail: 1,
-          // 在 GitHub Actions 中不输出日志
-          silent: !!process.env.GITHUB_ACTIONS,
-          // poolOptions: {
-          //   threads: {
-          //     singleThread: process.env.SINGLE_THREAD == 'false' ? false : true,
-          //   },
-          // },
-        },
-      }
+          root: process.cwd(),
+          resolve: {
+            mainFields: ['module'],
+          },
+          test: {
+            globals: true,
+            setupFiles: resolve(__dirname, './setup/server.ts'),
+            alias: tsConfigPathsToAlias(),
+            include: ['packages/**/__tests__/**/*.test.ts'],
+            exclude: [
+              '**/node_modules/**',
+              '**/dist/**',
+              '**/lib/**',
+              '**/es/**',
+              '**/e2e/**',
+              '**/__e2e__/**',
+              '**/{vitest,commitlint}.config.*',
+              'packages/**/{dumi-theme-nocobase,sdk,client}/**/__tests__/**/*.{test,spec}.{ts,tsx}',
+            ],
+            testTimeout: 300000,
+            hookTimeout: 300000,
+            // bail: 1,
+            // 在 GitHub Actions 中不输出日志
+            silent: !!process.env.GITHUB_ACTIONS,
+            // poolOptions: {
+            //   threads: {
+            //     singleThread: process.env.SINGLE_THREAD == 'false' ? false : true,
+            //   },
+            // },
+          },
+        }
       : {
-        plugins: [react()],
-        resolve: {
-          mainFields: ['module'],
-        },
-        define: {
-          'process.env.__TEST__': true,
-          'process.env.__E2E__': false,
-        },
-        test: {
-          globals: true,
-          setupFiles: resolve(__dirname, './setup/client.ts'),
-          environment: 'jsdom',
-          css: false,
-          alias: tsConfigPathsToAlias(),
-          include: ['packages/**/{dumi-theme-nocobase,sdk,client}/**/__tests__/**/*.{test,spec}.{ts,tsx}'],
-          exclude: [
-            '**/node_modules/**',
-            '**/dist/**',
-            '**/lib/**',
-            '**/es/**',
-            '**/e2e/**',
-            '**/__e2e__/**',
-            '**/{vitest,commitlint}.config.*',
-          ],
-          testTimeout: 300000,
-          // 在 GitHub Actions 中不输出日志
-          silent: !!process.env.GITHUB_ACTIONS,
-          server: {
-            deps: {
-              inline: ['@juggle/resize-observer', 'clsx'],
+          plugins: [react()],
+          resolve: {
+            mainFields: ['module'],
+          },
+          define: {
+            'process.env.__TEST__': true,
+            'process.env.__E2E__': false,
+          },
+          test: {
+            globals: true,
+            setupFiles: resolve(__dirname, './setup/client.ts'),
+            environment: 'jsdom',
+            css: false,
+            alias: tsConfigPathsToAlias(),
+            include: ['packages/**/{dumi-theme-nocobase,sdk,client}/**/__tests__/**/*.{test,spec}.{ts,tsx}'],
+            exclude: [
+              '**/node_modules/**',
+              '**/dist/**',
+              '**/lib/**',
+              '**/es/**',
+              '**/e2e/**',
+              '**/__e2e__/**',
+              '**/{vitest,commitlint}.config.*',
+            ],
+            testTimeout: 300000,
+            // 在 GitHub Actions 中不输出日志
+            silent: !!process.env.GITHUB_ACTIONS,
+            server: {
+              deps: {
+                inline: ['@juggle/resize-observer', 'clsx'],
+              },
             },
           },
         },
-      },
   );
 };