@nocobase/test 2.1.0-beta.22 → 2.1.0-beta.23

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

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/test",
-  "version": "2.1.0-beta.22",
+  "version": "2.1.0-beta.23",
   "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-beta.22",
-    "@nocobase/utils": "2.1.0-beta.22",
+    "@nocobase/server": "2.1.0-beta.23",
+    "@nocobase/utils": "2.1.0-beta.23",
     "@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": "53ad02861ed8e813103f59659804417118c85b4c"
+  "gitHead": "bb4c0d3551bf9eff505b63756dd24a0813231f16"
 }

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}/**/*`),
   ];
 }
 
@@ -220,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}`),
   };
 };