@nocobase/test 2.1.0-alpha.22 → 2.1.0-alpha.24

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/package.json

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