@nocobase/test 1.7.0-beta.8 → 1.7.0

package/es/e2e/e2eUtils.d.ts

@@ -161,10 +161,17 @@ export interface PageConfig {
      */
     collections?: CollectionSetting[];
     /**
+     * @deprecate 在菜单被重构之后，没有办法直接复制完整的页面 Schema 了。所以这个选项不推荐使用了。
+     * 推荐使用 tabSchema，复制一个页面 tab 的 Schema 传给 tabSchema。
+     *
      * 页面整体的 Schema
      * @default undefined
      */
     pageSchema?: any;
+    /**
+     * 页面 Tab 的 Schema。当 pageSchema 和 tabSchema 都存在时，最终显示的会是 tabSchema 的内容
+     */
+    tabSchema?: any;
     /** 如果为 true 则表示不会更改 PageSchema 的 uid */
     keepUid?: boolean;
     /** 在 URL 中的 uid，例如：/admin/0ig6xhe03u2 */

package/es/server/index.d.ts

@@ -12,7 +12,6 @@ export { default as supertest } from 'supertest';
 export * from './memory-pub-sub-adapter';
 export * from './mock-isolated-cluster';
 export * from './mock-server';
-export declare const pgOnly: () => any;
 export declare const isPg: () => boolean;
 export declare const isMysql: () => boolean;
 export declare function randomStr(): string;

package/es/server/mock-server.d.ts

@@ -56,7 +56,7 @@ interface Resource {
     sort: (params?: SortActionParams) => Promise<supertest.Response>;
     [name: string]: (params?: ActionParams) => Promise<supertest.Response>;
 }
-interface ExtendedAgent extends SuperAgentTest {
+export interface ExtendedAgent extends SuperAgentTest {
     login: (user: any, roleName?: string) => Promise<ExtendedAgent>;
     loginUsingId: (userId: number, roleName?: string) => Promise<ExtendedAgent>;
     resource: (name: string, resourceOf?: any) => Resource;

package/lib/client/utils/utils.js

@@ -40,7 +40,6 @@ const WaitApp = /* @__PURE__ */ __name(async () => {
   });
   const loadError = import_react.screen.queryByText("App Error");
   if (loadError) {
-    expectNoTsError(import_react.screen.queryByText("App Error")).not.toBeInTheDocument();
   }
   const renderError = import_react.screen.queryByText("Render Failed");
   if (renderError) {

package/lib/e2e/e2eUtils.d.ts

@@ -161,10 +161,17 @@ export interface PageConfig {
      */
     collections?: CollectionSetting[];
     /**
+     * @deprecate 在菜单被重构之后，没有办法直接复制完整的页面 Schema 了。所以这个选项不推荐使用了。
+     * 推荐使用 tabSchema，复制一个页面 tab 的 Schema 传给 tabSchema。
+     *
      * 页面整体的 Schema
      * @default undefined
      */
     pageSchema?: any;
+    /**
+     * 页面 Tab 的 Schema。当 pageSchema 和 tabSchema 都存在时，最终显示的会是 tabSchema 的内容
+     */
+    tabSchema?: any;
     /** 如果为 true 则表示不会更改 PageSchema 的 uid */
     keepUid?: boolean;
     /** 在 URL 中的 uid，例如：/admin/0ig6xhe03u2 */

package/lib/e2e/e2eUtils.js

@@ -76,6 +76,20 @@ function getPageMenuSchema({ pageSchemaUid, tabSchemaUid, tabSchemaName }) {
   };
 }
 __name(getPageMenuSchema, "getPageMenuSchema");
+function getPageMenuSchemaWithTabSchema({ tabSchema }) {
+  if (!tabSchema) {
+    return null;
+  }
+  return {
+    type: "void",
+    "x-component": "Page",
+    properties: {
+      [tabSchema.name]: tabSchema
+    },
+    "x-uid": (0, import_shared.uid)()
+  };
+}
+__name(getPageMenuSchemaWithTabSchema, "getPageMenuSchemaWithTabSchema");
 const PORT = process.env.APP_PORT || 2e4;
 const APP_BASE_URL = process.env.APP_BASE_URL || `http://localhost:${PORT}`;
 const _NocoPage = class _NocoPage {
@@ -90,7 +104,7 @@ const _NocoPage = class _NocoPage {
   collectionsName;
   _waitForInit;
   async init() {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     const waitList = [];
     if ((_b = (_a = this.options) == null ? void 0 : _a.collections) == null ? void 0 : _b.length) {
       const collections = omitSomeFields(this.options.collections);
@@ -102,16 +116,17 @@ const _NocoPage = class _NocoPage {
         type: (_c = this.options) == null ? void 0 : _c.type,
         name: (_d = this.options) == null ? void 0 : _d.name,
         pageSchema: (_e = this.options) == null ? void 0 : _e.pageSchema,
-        url: (_f = this.options) == null ? void 0 : _f.url,
-        keepUid: (_g = this.options) == null ? void 0 : _g.keepUid,
-        pageUid: (_h = this.options) == null ? void 0 : _h.pageUid
+        tabSchema: (_f = this.options) == null ? void 0 : _f.tabSchema,
+        url: (_g = this.options) == null ? void 0 : _g.url,
+        keepUid: (_h = this.options) == null ? void 0 : _h.keepUid,
+        pageUid: (_i = this.options) == null ? void 0 : _i.pageUid
       })
     );
     const result = await Promise.all(waitList);
     const { schemaUid, routeId } = result[result.length - 1] || {};
     this.uid = schemaUid;
     this.desktopRouteId = routeId;
-    this.url = `${((_i = this.options) == null ? void 0 : _i.basePath) || "/admin/"}${this.uid || this.desktopRouteId}`;
+    this.url = `${((_j = this.options) == null ? void 0 : _j.basePath) || "/admin/"}${this.uid || this.desktopRouteId}`;
   }
   async goto() {
     var _a;
@@ -406,13 +421,14 @@ const updateUidOfPageSchema = /* @__PURE__ */ __name((uiSchema) => {
 }, "updateUidOfPageSchema");
 const createPage = /* @__PURE__ */ __name(async (options) => {
   var _a, _b, _c, _d;
-  const { type = "page", url, name, pageSchema, keepUid, pageUid: pageUidFromOptions } = options || {};
+  const { type = "page", url, name, pageSchema, tabSchema, keepUid, pageUid: pageUidFromOptions } = options || {};
   const api = await import_test.request.newContext({
     storageState: process.env.PLAYWRIGHT_AUTH_FILE
   });
+  const schema = getPageMenuSchemaWithTabSchema({ tabSchema }) || pageSchema;
   const state = await api.storageState();
   const headers = getHeaders(state);
-  const newPageSchema = keepUid ? pageSchema : updateUidOfPageSchema(pageSchema);
+  const newPageSchema = keepUid ? schema : updateUidOfPageSchema(schema);
   const pageSchemaUid = (newPageSchema == null ? void 0 : newPageSchema["x-uid"]) || (0, import_shared.uid)();
   const newTabSchemaUid = (0, import_shared.uid)();
   const newTabSchemaName = (0, import_shared.uid)();
@@ -916,6 +932,7 @@ async function expectSettingsMenu({
 }) {
   await page.waitForTimeout(100);
   await showMenu();
+  await page.waitForTimeout(2e3);
   for (const option of supportedOptions) {
     await (0, import_test.expect)(page.getByRole("menuitem", { name: option, exact: option === "Edit" })).toBeVisible();
   }

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

@@ -30,13 +30,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
-var import_http = __toESM(require("http"));
-var import_url = __toESM(require("url"));
-var import_pg = __toESM(require("pg"));
 var import_dotenv = __toESM(require("dotenv"));
-var import_path = __toESM(require("path"));
-var import_promise = __toESM(require("mysql2/promise"));
+var import_http = __toESM(require("http"));
 var import_mariadb = __toESM(require("mariadb"));
+var import_promise = __toESM(require("mysql2/promise"));
+var import_path = __toESM(require("path"));
+var import_pg = __toESM(require("pg"));
+var import_url = __toESM(require("url"));
 import_dotenv.default.config({ path: import_path.default.resolve(process.cwd(), ".env.test") });
 const _BaseClient = class _BaseClient {
   _client = null;

package/lib/server/index.d.ts

@@ -12,7 +12,6 @@ export { default as supertest } from 'supertest';
 export * from './memory-pub-sub-adapter';
 export * from './mock-isolated-cluster';
 export * from './mock-server';
-export declare const pgOnly: () => any;
 export declare const isPg: () => boolean;
 export declare const isMysql: () => boolean;
 export declare function randomStr(): string;

package/lib/server/index.js

@@ -44,7 +44,6 @@ __export(server_exports, {
   isMysql: () => isMysql,
   isPg: () => isPg,
   mockDatabase: () => import_database.mockDatabase,
-  pgOnly: () => pgOnly,
   randomStr: () => randomStr,
   sleep: () => sleep,
   startServerWithRandomPort: () => startServerWithRandomPort,
@@ -52,14 +51,12 @@ __export(server_exports, {
   waitSecond: () => waitSecond
 });
 module.exports = __toCommonJS(server_exports);
-var import_vitest = require("vitest");
 var import_ws = __toESM(require("ws"));
 var import_database = require("@nocobase/database");
 var import_supertest = __toESM(require("supertest"));
 __reExport(server_exports, require("./memory-pub-sub-adapter"), module.exports);
 __reExport(server_exports, require("./mock-isolated-cluster"), module.exports);
 __reExport(server_exports, require("./mock-server"), 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");
 const isMysql = /* @__PURE__ */ __name(() => process.env.DB_DIALECT == "mysql", "isMysql");
 function randomStr() {
@@ -119,7 +116,6 @@ const createWsClient = /* @__PURE__ */ __name(async ({ serverPort, options = {}
   isMysql,
   isPg,
   mockDatabase,
-  pgOnly,
   randomStr,
   sleep,
   startServerWithRandomPort,

package/lib/server/mock-server.d.ts

@@ -56,7 +56,7 @@ interface Resource {
     sort: (params?: SortActionParams) => Promise<supertest.Response>;
     [name: string]: (params?: ActionParams) => Promise<supertest.Response>;
 }
-interface ExtendedAgent extends SuperAgentTest {
+export interface ExtendedAgent extends SuperAgentTest {
     login: (user: any, roleName?: string) => Promise<ExtendedAgent>;
     loginUsingId: (userId: number, roleName?: string) => Promise<ExtendedAgent>;
     resource: (name: string, resourceOf?: any) => Resource;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/test",
-  "version": "1.7.0-beta.8",
+  "version": "1.7.0",
   "main": "lib/index.js",
   "module": "./src/index.ts",
   "types": "./lib/index.d.ts",
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "@faker-js/faker": "8.1.0",
-    "@nocobase/server": "1.7.0-beta.8",
+    "@nocobase/server": "1.7.0",
     "@playwright/test": "^1.45.3",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.0.0",
@@ -69,12 +69,11 @@
     "mysql2": "^3.11.0",
     "pg": "^8.7.3",
     "pg-hstore": "^2.3.4",
-    "sqlite3": "^5.0.8",
     "supertest": "^6.1.6",
     "vite": "^5.0.0",
     "vitest": "^1.5.0",
     "vitest-dom": "^0.1.1",
     "ws": "^8.13.0"
   },
-  "gitHead": "9ad35ee90db98d95dfa660645d155f4f4e81b47c"
+  "gitHead": "767ae089e404a104d718962272289c0bec01803a"
 }