@nocobase/test 1.0.0-alpha.8 → 1.0.1-alpha.1

package/es/client/index.d.ts

@@ -11,10 +11,12 @@ import { sleep } from '../web';
 export * from './utils';
 export { renderHook } from '@testing-library/react-hooks';
 declare function customRender(ui: React.ReactElement, options?: {}): import("@testing-library/react").RenderResult<typeof import("@testing-library/dom/types/queries"), HTMLElement, HTMLElement>;
+export declare function waitForApp(): Promise<void>;
+export declare function renderApp(element: React.JSX.Element): Promise<import("@testing-library/react").RenderResult<typeof import("@testing-library/dom/types/queries"), HTMLElement, HTMLElement>>;
 export * from '@testing-library/react';
 export { default as userEvent } from '@testing-library/user-event';
 export { customRender as render, sleep };
-export * from './renderApp';
+export * from './renderAppOptions';
 export * from './renderHookWithApp';
 export * from './renderSettings';
 export * from './renderSingleSettings';

package/es/client/index.mjs

@@ -1,15 +1,174 @@
 import { waitFor, screen, render } from "@testing-library/react";
 export * from "@testing-library/react";
-import React, { Fragment } from "react";
+import { observer, useForm, useFieldSchema } from "@formily/react";
 import MockAdapter from "axios-mock-adapter";
 import _, { pick, get } from "lodash";
-import { observer, useForm, useFieldSchema } from "@formily/react";
+import React, { Fragment } from "react";
 import { Application, AntdSchemaComponentPlugin, SchemaSettingsPlugin, CollectionPlugin, LocalDataSource, SchemaSettings, SchemaComponent, DataBlockProvider } from "@nocobase/client";
-import { expect } from "vitest";
+import { expect as expect$1 } from "vitest";
 import userEvent from "@testing-library/user-event";
 import { default as default2 } from "@testing-library/user-event";
 import { renderHook } from "@testing-library/react-hooks";
 import { renderHook as renderHook2 } from "@testing-library/react-hooks";
+const key = "data-source2";
+const displayName = "Data Source 2";
+const status = "loaded";
+const type = "postgres";
+const isDBInstance = true;
+const collections = [
+  {
+    name: "test",
+    title: "test",
+    tableName: "test",
+    timestamps: false,
+    autoGenId: false,
+    filterTargetKey: "id",
+    fields: [
+      {
+        name: "id",
+        type: "integer",
+        allowNull: false,
+        primaryKey: false,
+        unique: false,
+        autoIncrement: true,
+        possibleTypes: [
+          "integer",
+          "sort"
+        ],
+        rawType: "INTEGER",
+        "interface": "integer",
+        uiSchema: {
+          type: "number",
+          "x-component": "InputNumber",
+          "x-component-props": {
+            stringMode: true,
+            step: "1"
+          },
+          "x-validator": "integer",
+          title: "id"
+        }
+      },
+      {
+        name: "title",
+        type: "string",
+        allowNull: false,
+        primaryKey: false,
+        unique: false,
+        possibleTypes: [
+          "string",
+          "uuid",
+          "nanoid"
+        ],
+        rawType: "CHARACTER VARYING(255)",
+        "interface": "input",
+        uiSchema: {
+          "x-component": "Input",
+          "x-component-props": {
+            style: {
+              width: "100%"
+            }
+          },
+          title: "title"
+        }
+      },
+      {
+        name: "content",
+        type: "text",
+        allowNull: true,
+        primaryKey: false,
+        unique: false,
+        rawType: "TEXT",
+        "interface": "textarea",
+        uiSchema: {
+          type: "string",
+          "x-component": "Input.TextArea",
+          title: "content"
+        }
+      }
+    ],
+    introspected: true
+  },
+  {
+    name: "test2",
+    title: "test2",
+    tableName: "test2",
+    timestamps: false,
+    autoGenId: false,
+    filterTargetKey: "id",
+    fields: [
+      {
+        name: "id",
+        type: "integer",
+        allowNull: false,
+        primaryKey: true,
+        unique: false,
+        autoIncrement: true,
+        possibleTypes: [
+          "integer",
+          "sort"
+        ],
+        rawType: "INTEGER",
+        "interface": "integer",
+        uiSchema: {
+          type: "number",
+          "x-component": "InputNumber",
+          "x-component-props": {
+            stringMode: true,
+            step: "1"
+          },
+          "x-validator": "integer",
+          title: "id"
+        }
+      },
+      {
+        name: "title",
+        type: "string",
+        allowNull: true,
+        primaryKey: false,
+        unique: false,
+        possibleTypes: [
+          "string",
+          "uuid",
+          "nanoid"
+        ],
+        rawType: "CHARACTER VARYING(255)",
+        "interface": "input",
+        uiSchema: {
+          "x-component": "Input",
+          "x-component-props": {
+            style: {
+              width: "100%"
+            }
+          },
+          title: "title"
+        }
+      },
+      {
+        name: "content",
+        type: "text",
+        allowNull: true,
+        primaryKey: false,
+        unique: false,
+        rawType: "TEXT",
+        "interface": "textarea",
+        uiSchema: {
+          type: "string",
+          "x-component": "Input.TextArea",
+          title: "content"
+        }
+      }
+    ],
+    introspected: true
+  }
+];
+const dataSource2 = {
+  key,
+  displayName,
+  status,
+  type,
+  isDBInstance,
+  collections
+};
 const dataSourceMainCollections = [
   {
     key: "yzowed2vee0",
@@ -833,165 +992,6 @@ const dataSourceMainCollections = [
     filterTargetKey: "id"
   }
 ];
-const key = "data-source2";
-const displayName = "Data Source 2";
-const status = "loaded";
-const type = "postgres";
-const isDBInstance = true;
-const collections = [
-  {
-    name: "test",
-    title: "test",
-    tableName: "test",
-    timestamps: false,
-    autoGenId: false,
-    filterTargetKey: "id",
-    fields: [
-      {
-        name: "id",
-        type: "integer",
-        allowNull: false,
-        primaryKey: false,
-        unique: false,
-        autoIncrement: true,
-        possibleTypes: [
-          "integer",
-          "sort"
-        ],
-        rawType: "INTEGER",
-        "interface": "integer",
-        uiSchema: {
-          type: "number",
-          "x-component": "InputNumber",
-          "x-component-props": {
-            stringMode: true,
-            step: "1"
-          },
-          "x-validator": "integer",
-          title: "id"
-        }
-      },
-      {
-        name: "title",
-        type: "string",
-        allowNull: false,
-        primaryKey: false,
-        unique: false,
-        possibleTypes: [
-          "string",
-          "uuid",
-          "nanoid"
-        ],
-        rawType: "CHARACTER VARYING(255)",
-        "interface": "input",
-        uiSchema: {
-          "x-component": "Input",
-          "x-component-props": {
-            style: {
-              width: "100%"
-            }
-          },
-          title: "title"
-        }
-      },
-      {
-        name: "content",
-        type: "text",
-        allowNull: true,
-        primaryKey: false,
-        unique: false,
-        rawType: "TEXT",
-        "interface": "textarea",
-        uiSchema: {
-          type: "string",
-          "x-component": "Input.TextArea",
-          title: "content"
-        }
-      }
-    ],
-    introspected: true
-  },
-  {
-    name: "test2",
-    title: "test2",
-    tableName: "test2",
-    timestamps: false,
-    autoGenId: false,
-    filterTargetKey: "id",
-    fields: [
-      {
-        name: "id",
-        type: "integer",
-        allowNull: false,
-        primaryKey: true,
-        unique: false,
-        autoIncrement: true,
-        possibleTypes: [
-          "integer",
-          "sort"
-        ],
-        rawType: "INTEGER",
-        "interface": "integer",
-        uiSchema: {
-          type: "number",
-          "x-component": "InputNumber",
-          "x-component-props": {
-            stringMode: true,
-            step: "1"
-          },
-          "x-validator": "integer",
-          title: "id"
-        }
-      },
-      {
-        name: "title",
-        type: "string",
-        allowNull: true,
-        primaryKey: false,
-        unique: false,
-        possibleTypes: [
-          "string",
-          "uuid",
-          "nanoid"
-        ],
-        rawType: "CHARACTER VARYING(255)",
-        "interface": "input",
-        uiSchema: {
-          "x-component": "Input",
-          "x-component-props": {
-            style: {
-              width: "100%"
-            }
-          },
-          title: "title"
-        }
-      },
-      {
-        name: "content",
-        type: "text",
-        allowNull: true,
-        primaryKey: false,
-        unique: false,
-        rawType: "TEXT",
-        "interface": "textarea",
-        uiSchema: {
-          type: "string",
-          "x-component": "Input.TextArea",
-          title: "content"
-        }
-      }
-    ],
-    introspected: true
-  }
-];
-const dataSource2 = {
-  key,
-  displayName,
-  status,
-  type,
-  isDBInstance,
-  collections
-};
 const dataSourceMainData = {
   "users:list": {
     data: [
@@ -1384,6 +1384,9 @@ const defaultApis = {
   ...dataSourceMainData
 };
 function getProcessMockData(apis, key2) {
+  if (typeof apis[key2] === "function") {
+    return apis[key2];
+  }
   return (config) => {
     var _a, _b;
     if (!apis[key2])
@@ -1574,7 +1577,7 @@ function withSchema(Component, name) {
 const CommonSchemaComponent = withSchema(function CommonSchemaComponent2(props) {
   return /* @__PURE__ */ React.createElement(React.Fragment, null, props.children);
 });
-const expectNoTsError = expect;
+const expectNoTsError = expect$1;
 const WaitApp = async () => {
   await waitFor(() => {
     expectNoTsError(screen.queryByText("Loading...")).not.toBeInTheDocument();
@@ -1725,17 +1728,17 @@ async function checkModal(options) {
 async function checkSchema(matchObj, name) {
   const objText = screen.queryByTestId(name ? `test-schema-${name}` : `test-schema`);
   await waitFor(() => {
-    expect(JSON.parse(objText.textContent)).toMatchObject(matchObj);
+    expect$1(JSON.parse(objText.textContent)).toMatchObject(matchObj);
   });
 }
-const renderApp = async (options) => {
+const renderAppOptions = async (options) => {
   const App = getAppComponent(options);
   const res = render(/* @__PURE__ */ React.createElement(App, null));
   await WaitApp();
   return res;
 };
 const renderReadPrettyApp = (options) => {
-  return renderApp({ ...options, schema: addXReadPrettyToEachLayer(options.schema) });
+  return renderAppOptions({ ...options, schema: addXReadPrettyToEachLayer(options.schema) });
 };
 const renderHookWithApp = async (options) => {
   const { hook: useHook, props, Wrapper = Fragment, ...otherOptions } = options;
@@ -1756,7 +1759,7 @@ async function showSettingsMenu(container = document) {
 }
 const renderSettings = async (options = {}) => {
   const { container = () => document, ...appOptions } = options;
-  const result = await renderApp({ ...appOptions, designable: true });
+  const result = await renderAppOptions({ ...appOptions, designable: true });
   const containerElement = container();
   await showSettingsMenu(containerElement);
   return result;
@@ -1820,7 +1823,7 @@ async function checkSwitchSetting(options) {
     if (formItem2) {
       const switchElement2 = formItem2.querySelector("button[role=switch]");
       const newChecked = switchElement2.getAttribute("aria-checked");
-      expect(newChecked).not.toBe(oldChecked);
+      expect$1(newChecked).not.toBe(oldChecked);
       oldChecked = newChecked;
     } else {
       await showSettingsMenu();
@@ -1892,7 +1895,7 @@ const types = {
 async function checkSettings(list, checkLength = false) {
   if (checkLength) {
     const menuList = screen.getByTestId("schema-settings-menu");
-    expect(menuList.querySelectorAll('li[role="menuitem"]')).toHaveLength(list.length);
+    expect$1(menuList.querySelectorAll('li[role="menuitem"]')).toHaveLength(list.length);
   }
   for (const item of list) {
     if (!screen.queryByTestId("schema-settings-menu")) {
@@ -1960,6 +1963,16 @@ function customRender(ui, options = {}) {
     ...options
   });
 }
+async function waitForApp() {
+  return waitFor(() => {
+    expect(screen.queryByText("Loading...")).not.toBeInTheDocument();
+  });
+}
+async function renderApp(element) {
+  const res = render(element);
+  await waitForApp();
+  return res;
+}
 export {
   WaitApp,
   checkBlockTitle,
@@ -1974,6 +1987,7 @@ export {
   expectNoTsError,
   customRender as render,
   renderApp,
+  renderAppOptions,
   renderHook2 as renderHook,
   renderHookWithApp,
   renderReadPrettyApp,
@@ -1983,5 +1997,6 @@ export {
   renderSingleSettings,
   showSettingsMenu,
   sleep,
-  default2 as userEvent
+  default2 as userEvent,
+  waitForApp
 };

package/es/client/{renderApp.d.ts → renderAppOptions.d.ts}

@@ -7,5 +7,5 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { GetAppComponentOptions } from '../web';
-export declare const renderApp: (options: GetAppComponentOptions) => Promise<import("@testing-library/react").RenderResult<typeof import("@testing-library/dom/types/queries"), HTMLElement, HTMLElement>>;
+export declare const renderAppOptions: (options: GetAppComponentOptions) => Promise<import("@testing-library/react").RenderResult<typeof import("@testing-library/dom/types/queries"), HTMLElement, HTMLElement>>;
 export declare const renderReadPrettyApp: (options: GetAppComponentOptions) => Promise<import("@testing-library/react").RenderResult<typeof import("@testing-library/dom/types/queries"), HTMLElement, HTMLElement>>;

package/es/e2e/e2eUtils.d.ts

@@ -169,6 +169,7 @@ export interface PageConfig {
     keepUid?: boolean;
 }
 interface ExtendUtils {
+    page?: Page;
     /**
      * 根据配置，生成一个 NocoBase 的页面
      * @param pageConfig 页面配置
@@ -258,9 +259,14 @@ interface ExtendUtils {
      */
     destoryExternalDataSource: <T = any>(key: string) => Promise<T>;
     /**
-     * 清空区块模板
+     * 清空区块模板，该方法应该放到测试用例开始的位置（放在末尾的话，如果测试报错会导致模板不会被清空）
      */
-    clearBlockTemplates: () => Promise<void>;
+    clearBlockTemplates: ({ immediate, }?: {
+        /**
+         * 是否立即清空，默认为 false。如果为 true，则会立即清空，否则会等到测试用例结束后再清空
+         */
+        immediate: boolean;
+    }) => Promise<void>;
 }
 export declare class NocoPage {
     private options?;