@nocobase/test 2.1.0-beta.9 → 2.2.0-alpha.1

package/lib/client/index.js

@@ -46,7 +46,9 @@ __export(client_exports, {
   waitForApp: () => waitForApp
 });
 module.exports = __toCommonJS(client_exports);
+var import_react = __toESM(require("react"));
 var import_react2 = require("@testing-library/react");
+var import_flow_engine = require("@nocobase/flow-engine");
 var import_web = require("../web");
 __reExport(client_exports, require("./utils"), module.exports);
 var import_react_hooks = require("@testing-library/react-hooks");
@@ -59,9 +61,9 @@ __reExport(client_exports, require("./renderSingleSettings"), module.exports);
 __reExport(client_exports, require("./settingsChecker"), module.exports);
 __reExport(client_exports, require("./commonSettingsChecker"), module.exports);
 function customRender(ui, options = {}) {
+  const flowEngine = new import_flow_engine.FlowEngine();
   return (0, import_react2.render)(ui, {
-    // wrap provider(s) here if needed
-    wrapper: /* @__PURE__ */ __name(({ children }) => children, "wrapper"),
+    wrapper: /* @__PURE__ */ __name(({ children }) => /* @__PURE__ */ import_react.default.createElement(import_flow_engine.FlowEngineProvider, { engine: flowEngine }, children), "wrapper"),
     ...options
   });
 }

package/lib/client/renderAppOptions.js

@@ -42,8 +42,8 @@ __export(renderAppOptions_exports, {
 });
 module.exports = __toCommonJS(renderAppOptions_exports);
 var import_react = __toESM(require("react"));
-var import__ = require(".");
 var import_web = require("../web");
+var import__ = require(".");
 var import_utils = require("./utils");
 const renderAppOptions = /* @__PURE__ */ __name(async (options) => {
   const App = (0, import_web.getAppComponent)(options);

package/lib/client/renderSettings.js

@@ -35,15 +35,40 @@ module.exports = __toCommonJS(renderSettings_exports);
 var import_react = require("@testing-library/react");
 var import_renderAppOptions = require("./renderAppOptions");
 var import_utils = require("./utils");
+const querySettingsButton = /* @__PURE__ */ __name((container) => {
+  return container.querySelector('[aria-label^="designer-schema-settings-"]');
+}, "querySettingsButton");
+const querySettingsTrigger = /* @__PURE__ */ __name((container) => {
+  const button = querySettingsButton(container);
+  if (!button) {
+    return null;
+  }
+  return button.closest(".ant-dropdown-trigger") || button;
+}, "querySettingsTrigger");
+const revealSchemaToolbar = /* @__PURE__ */ __name((container) => {
+  const blockItem = container.querySelector('[aria-label^="block-item-"]');
+  if (!blockItem) {
+    return;
+  }
+  import_react.fireEvent.mouseEnter(blockItem);
+  import_react.fireEvent.mouseOver(blockItem);
+}, "revealSchemaToolbar");
 async function showSettingsMenu(container = document) {
   await (0, import_react.waitFor)(() => {
-    return (0, import_utils.expectNoTsError)(container.querySelector('[aria-label^="designer-schema-settings-"]')).toBeInTheDocument();
+    if (!querySettingsButton(container)) {
+      revealSchemaToolbar(container);
+    }
+    return (0, import_utils.expectNoTsError)(querySettingsButton(container)).toBeInTheDocument();
   });
   const button = await (0, import_react.waitFor)(() => {
-    return container.querySelector('[aria-label^="designer-schema-settings-"]');
+    if (!querySettingsButton(container)) {
+      revealSchemaToolbar(container);
+    }
+    return querySettingsButton(container);
   });
-  import_react.fireEvent.mouseEnter(button);
-  import_react.fireEvent.mouseOver(button);
+  const trigger = querySettingsTrigger(container) || button;
+  import_react.fireEvent.mouseEnter(trigger);
+  import_react.fireEvent.mouseOver(trigger);
   await (0, import_react.waitFor)(() => {
     return (0, import_utils.expectNoTsError)(import_react.screen.queryByTestId("schema-settings-menu")).toBeInTheDocument();
   });

package/lib/scripts/test-db-creator.js

@@ -80,6 +80,18 @@ const _BaseClient = class _BaseClient {
 };
 __name(_BaseClient, "BaseClient");
 let BaseClient = _BaseClient;
+function escapeMysqlIdentifier(name) {
+  return `\`${String(name).replace(/`/g, "``")}\``;
+}
+__name(escapeMysqlIdentifier, "escapeMysqlIdentifier");
+function escapeMysqlString(value) {
+  return `'${String(value).replace(/\\/g, "\\\\").replace(/'/g, "\\'")}'`;
+}
+__name(escapeMysqlString, "escapeMysqlString");
+function mysqlAppUser() {
+  return String(process.env["DB_APP_USER"] || process.env["DB_USER"] || "").trim();
+}
+__name(mysqlAppUser, "mysqlAppUser");
 const _PostgresClient = class _PostgresClient extends BaseClient {
   async _removeDB(name) {
     await this._client.query(`DROP DATABASE IF EXISTS ${name}`);
@@ -107,7 +119,15 @@ const _MySQLClient = class _MySQLClient extends BaseClient {
     await this._client.query(`DROP DATABASE IF EXISTS ${name}`);
   }
   async _createDB(name) {
-    await this._client.query(`CREATE DATABASE IF NOT EXISTS ${name}`);
+    const database = escapeMysqlIdentifier(name);
+    const appUser = mysqlAppUser();
+    if (!appUser) {
+      throw new Error("DB_APP_USER or DB_USER is required for MySQL test database grants.");
+    }
+    const user = escapeMysqlString(appUser);
+    await this._client.query(`CREATE DATABASE IF NOT EXISTS ${database}`);
+    await this._client.query(`GRANT ALL PRIVILEGES ON ${database}.* TO ${user}@'%'`);
+    await this._client.query("FLUSH PRIVILEGES");
   }
   async _createConnection() {
     return import_promise.default.createConnection({
@@ -126,7 +146,15 @@ const _MariaDBClient = class _MariaDBClient extends BaseClient {
     await this._client.query(`DROP DATABASE IF EXISTS ${name}`);
   }
   async _createDB(name) {
-    await this._client.query(`CREATE DATABASE IF NOT EXISTS ${name}`);
+    const database = escapeMysqlIdentifier(name);
+    const appUser = mysqlAppUser();
+    if (!appUser) {
+      throw new Error("DB_APP_USER or DB_USER is required for MariaDB test database grants.");
+    }
+    const user = escapeMysqlString(appUser);
+    await this._client.query(`CREATE DATABASE IF NOT EXISTS ${database}`);
+    await this._client.query(`GRANT ALL PRIVILEGES ON ${database}.* TO ${user}@'%'`);
+    await this._client.query("FLUSH PRIVILEGES");
   }
   async _createConnection() {
     return await import_mariadb.default.createConnection({

package/lib/server/mock-isolated-cluster.js

@@ -7,11 +7,9 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -26,21 +24,12 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var mock_isolated_cluster_exports = {};
 __export(mock_isolated_cluster_exports, {
   MockIsolatedCluster: () => MockIsolatedCluster
 });
 module.exports = __toCommonJS(mock_isolated_cluster_exports);
-var import_node_path = __toESM(require("node:path"));
 var import_node_child_process = require("node:child_process");
 var import_portfinder = require("portfinder");
 var import_utils = require("@nocobase/utils");
@@ -69,8 +58,8 @@ const _MockIsolatedCluster = class _MockIsolatedCluster {
           ...this.options.env,
           APP_PORT: `${port}`,
           APPEND_PRESET_BUILT_IN_PLUGINS: (this.options.plugins ?? []).join(","),
-          SOCKET_PATH: `storage/tests/gateway-cluster-${(0, import_utils.uid)()}.sock`,
-          PM2_HOME: import_node_path.default.resolve(process.cwd(), `storage/tests/.pm2-${(0, import_utils.uid)()}`)
+          SOCKET_PATH: (0, import_utils.storagePathJoin)("tests", `gateway-cluster-${(0, import_utils.uid)()}.sock`),
+          PM2_HOME: (0, import_utils.storagePathJoin)("tests", `.pm2-${(0, import_utils.uid)()}`)
         }
       });
       await new Promise((resolve, reject) => {

package/lib/server/mock-server.js

@@ -53,8 +53,6 @@ var import_qs = __toESM(require("qs"));
 var import_supertest = __toESM(require("supertest"));
 var import_memory_pub_sub_adapter = require("./memory-pub-sub-adapter");
 var import_mock_data_source = require("./mock-data-source");
-var import_path = __toESM(require("path"));
-var import_node_process = __toESM(require("node:process"));
 var import_fs = require("fs");
 const _MockServer = class _MockServer extends import_server.Application {
   registerMockDataSource() {
@@ -264,7 +262,7 @@ async function createMockCluster({
 }
 __name(createMockCluster, "createMockCluster");
 async function createMockServer(options = {}) {
-  const cachePath = import_path.default.join(import_node_process.default.cwd(), "storage", "cache");
+  const cachePath = (0, import_utils.storagePathJoin)("cache");
   try {
     await import_fs.promises.rm(cachePath, { recursive: true, force: true });
     await import_fs.promises.mkdir(cachePath, { recursive: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/test",
-  "version": "2.1.0-beta.9",
+  "version": "2.2.0-alpha.1",
   "main": "lib/index.js",
   "module": "./src/index.ts",
   "types": "./lib/index.d.ts",
@@ -51,7 +51,8 @@
   },
   "dependencies": {
     "@faker-js/faker": "8.1.0",
-    "@nocobase/server": "2.1.0-beta.9",
+    "@nocobase/server": "2.2.0-alpha.1",
+    "@nocobase/utils": "2.2.0-alpha.1",
     "@playwright/test": "^1.45.3",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.0.0",
@@ -76,5 +77,5 @@
     "vitest-dom": "^0.1.1",
     "ws": "^8.13.0"
   },
-  "gitHead": "c3a2875e4cbbb43b1f2361e6f9f5f84a7d3f3c3c"
+  "gitHead": "303663aba6c6eefa27e6a6435b4c0352074ec40f"
 }

package/perf/scenarios/import/init.ts

@@ -1,5 +1,6 @@
 import { createMockServer } from '@nocobase/test';
 import { CollectionRepository } from '@nocobase/plugin-data-source-main';
+import { storagePathJoin } from '@nocobase/utils';
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
@@ -7,7 +8,7 @@ import ExcelJS from 'exceljs';
 import { faker } from '@faker-js/faker';
 import request from 'superagent';
 
-const storagePath = path.resolve(process.cwd(), 'storage', 'perf', 'importDataTest');
+const storagePath = storagePathJoin('perf', 'importDataTest');
 
 export default async function main() {
   const app = await createMockServer({

package/setup/server.ts

@@ -1,4 +1,4 @@
-import { initEnv } from '@nocobase/cli';
+import { initEnv } from '@nocobase/cli-v1';
 
 process.env.APP_ENV_PATH = process.env.APP_ENV_PATH || '.env.test';
 

package/vitest.mjs

@@ -10,6 +10,7 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
 const CORE_CLIENT_PACKAGES = ['sdk', 'client', 'client-v2', 'flow-engine'];
+const PLUGIN_CLIENT_PACKAGES = ['client', 'client-v2'];
 // 按路径填写要跳过服务端测试的插件目录（相对仓库根目录）
 const skipPluginPaths = [
   'packages/plugins/@nocobase/plugin-audit-logs',
@@ -114,7 +115,7 @@ const defineCommonConfig = () => {
 function getExclude(isServer) {
   return [
     `packages/core/${isServer ? '' : '!'}(${CORE_CLIENT_PACKAGES.join('|')})/**/*`,
-    `packages/**/src/${isServer ? 'client' : 'server'}/**/*`,
+    ...(isServer ? PLUGIN_CLIENT_PACKAGES : ['server']).map((dir) => `packages/**/src/${dir}/**/*`),
   ];
 }
 
@@ -181,6 +182,10 @@ export const getFilterInclude = (isServer, isCoverage) => {
     return false;
   });
 
+  if (argv[0] === 'run' || argv[0] === 'watch') {
+    argv = argv.slice(1);
+  }
+
   let filterFileOrDir = argv[0];
 
   if (!filterFileOrDir) return {};
@@ -216,7 +221,9 @@ export const getFilterInclude = (isServer, isCoverage) => {
 
   // 插件目录，区分 client 和 server
   return {
-    include: [`${filterFileOrDir}/src/${isServer ? 'server' : 'client'}/${suffix}`],
+    include: isServer
+      ? [`${filterFileOrDir}/src/server/${suffix}`]
+      : PLUGIN_CLIENT_PACKAGES.map((dir) => `${filterFileOrDir}/src/${dir}/${suffix}`),
   };
 };