fix: sub-table e2e test (#5823)

* fix: sub-table e2e test * fix: test * fix: test * fix: test * fix: test * fix: test
2025-05-07 06:29:25 +08:00 · 2024-12-07 23:18:02 +08:00 · 2024-12-07 23:18:02 +08:00 · db64d1cb52
commit db64d1cb52
parent 661398a3d8
10 changed files with 15 additions and 21 deletions
--- a/packages/core/client/src/modules/blocks/data-blocks/details-multi/e2e/schemaInitializer.test.ts
+++ b/packages/core/client/src/modules/blocks/data-blocks/details-multi/e2e/schemaInitializer.test.ts
@ -113,7 +113,7 @@ test.describe('configure actions', () => {
    await page.getByLabel('schema-initializer-ActionBar-detailsWithPaging:configureActions-general').hover();
    await page.getByRole('menuitem', { name: 'Edit' }).click();
    await page.getByLabel('schema-initializer-ActionBar-detailsWithPaging:configureActions-general').hover();
-    await page.getByRole('menuitem', { name: 'Delete' }).click();
+    await page.getByText('Delete').click();

    await page.mouse.move(300, 0);
    await expect(page.getByRole('button', { name: 'Edit' })).toBeVisible();
--- a/packages/core/client/src/modules/blocks/data-blocks/form/e2e/form-create/schemaInitializer.test.ts
+++ b/packages/core/client/src/modules/blocks/data-blocks/form/e2e/form-create/schemaInitializer.test.ts
@ -131,7 +131,7 @@ test.describe('configure actions', () => {
  test('subTable: should clear form value after submit', async ({ page, mockPage }) => {
    await mockPage(T3106).goto();

-    await page.getByRole('button', { name: 'Add new' }).click();
+    await page.locator('.nb-sub-table-addNew').click();
    await expect(
      page.getByLabel('block-item-CollectionField-users-form-users.nickname-Nickname').getByRole('textbox'),
    ).toHaveValue('test name');
@ -143,7 +143,7 @@ test.describe('configure actions', () => {
    ).toBeHidden();

    // 再次点击添加按钮，默认值应该正常显示出来
-    await page.getByRole('button', { name: 'Add new' }).click();
+    await page.locator('.nb-sub-table-addNew').click();
    await expect(
      page.getByLabel('block-item-CollectionField-users-form-users.nickname-Nickname').getByRole('textbox'),
    ).toHaveValue('test name');
@ -160,7 +160,7 @@ test.describe('configure actions', () => {
      .fill('123456');

    // 2. 添加一行子表格数据，其中显示刚填入的值
-    await page.getByRole('button', { name: 'Add new' }).click();
+    await page.locator('.nb-sub-table-addNew').click();
    await expect(
      page.getByLabel('block-item-CollectionField-roles-form-roles.name-Role UID').getByRole('textbox'),
    ).toHaveValue('123456');
--- a/packages/core/client/src/modules/blocks/data-blocks/form/e2e/form-create/schemaSettings.test.ts
+++ b/packages/core/client/src/modules/blocks/data-blocks/form/e2e/form-create/schemaSettings.test.ts
@ -202,10 +202,7 @@ test.describe('set default value', () => {
    await page.mouse.move(300, 0);

    // 当新增一行时，应该显示默认值
-    await page
-      .getByTestId('drawer-Action.Container-general-Add record')
-      .getByRole('button', { name: 'Add new' })
-      .click();
+    await page.getByTestId('drawer-Action.Container-general-Add record').locator('.nb-sub-table-addNew').click();
    await expect(
      page
        .getByRole('cell', { name: 'block-item-CollectionField-users-form-users.nickname-Nickname' })
@ -215,10 +212,7 @@ test.describe('set default value', () => {
    // https://nocobase.height.app/T-4028/description
    // 刷新页面后，默认值应该依然存在
    await page.reload();
-    await page
-      .getByTestId('drawer-Action.Container-general-Add record')
-      .getByRole('button', { name: 'Add new' })
-      .click();
+    await page.getByTestId('drawer-Action.Container-general-Add record').locator('.nb-sub-table-addNew').click();
    await expect(
      page
        .getByRole('cell', { name: 'block-item-CollectionField-users-form-users.nickname-Nickname' })
--- a/packages/core/client/src/modules/blocks/data-blocks/table/e2e/schemaSettings.test.ts
+++ b/packages/core/client/src/modules/blocks/data-blocks/table/e2e/schemaSettings.test.ts
@ -992,7 +992,7 @@ test.describe('table column schema settings', () => {
    await nocoPage.goto();

    // 1. 关系字段下拉框中应该有数据
-    await page.getByRole('button', { name: 'Add new' }).click();
+    await page.locator('.nb-sub-table-addNew').click();
    await page.getByTestId('select-object-multiple').click();
    await expect(page.getByRole('option', { name: record1.singleLineText, exact: true })).toBeVisible();

--- a/packages/core/client/src/modules/blocks/data-blocks/table/e2e/subTable.test.ts
+++ b/packages/core/client/src/modules/blocks/data-blocks/table/e2e/subTable.test.ts
@ -24,7 +24,7 @@ test.describe('subTable', () => {
    const expectedDateAfterModify = '2024-11-08';

    // 1. Click "Add new" to add a row, default values should display correctly`
-    await page.getByRole('button', { name: 'Add new' }).click();
+    await page.locator('.nb-sub-table-addNew').click();
    await expect(page.getByTestId('select-object-single').getByText('Super Admin')).toBeVisible();
    await expect(
      page.getByLabel('block-item-CollectionField-group-form-group.timeStart-').getByPlaceholder('Select date'),
@ -34,7 +34,7 @@ test.describe('subTable', () => {
    ).toHaveValue(expectedDateBeforeModify);

    // 2. Click "Add new" again to add another row, default values should display correctly
-    await page.getByRole('button', { name: 'Add new' }).click();
+    await page.locator('.nb-sub-table-addNew').click();
    await expect(page.getByTestId('select-object-single').getByText('Super Admin').nth(1)).toBeVisible();
    await expect(
      page.getByLabel('block-item-CollectionField-group-form-group.timeStart-').nth(1).getByPlaceholder('Select date'),
--- a/packages/core/client/src/modules/variable/e2e/currentObject.test.ts
+++ b/packages/core/client/src/modules/variable/e2e/currentObject.test.ts
@ -25,7 +25,7 @@ test.describe('variable: current object', () => {
    await page.getByRole('menuitemcheckbox', { name: 'Current object right' }).click();
    await page.getByRole('menuitemcheckbox', { name: 'Role UID' }).click();
    await page.getByRole('button', { name: 'OK', exact: true }).click();
-    await page.getByRole('button', { name: 'Add new' }).click();
+    await page.locator('.nb-sub-table-addNew').click();
    await page.getByRole('row', { name: 'table-index-4 block-item-' }).getByRole('textbox').nth(1).fill('123456');
    await expect(page.getByRole('row', { name: 'table-index-4 block-item-' }).getByRole('textbox').first()).toHaveValue(
      '123456',
--- a/packages/core/client/src/modules/variable/e2e/parentObject.test.ts
+++ b/packages/core/client/src/modules/variable/e2e/parentObject.test.ts
@ -37,7 +37,7 @@ test.describe('variable: parent object', () => {
    await page.getByRole('button', { name: 'OK' }).click();

    // 3. 当更改当前表单中的 text1 字段后，text2 和 text3 字段应该也会被自动更改
-    await page.getByRole('button', { name: 'Add new' }).click();
+    await page.locator('.nb-sub-table-addNew').click();
    await page
      .getByLabel('block-item-CollectionField-collection1-form-collection1.text1-text1')
      .getByRole('textbox')
@ -95,7 +95,7 @@ test.describe('variable: parent object', () => {
    await page.getByRole('button', { name: 'OK' }).click();

    // 2. Assert: When the text1 field in the current form is changed, the text2 and text3 fields should also be automatically changed
-    await page.getByRole('button', { name: 'Add new' }).click();
+    await page.locator('.nb-sub-table-addNew').click();
    await page
      .getByLabel('block-item-CollectionField-collection1-form-collection1.text1-text1')
      .getByRole('textbox')
--- a/packages/core/client/src/schema-component/antd/action/Action.Designer.tsx
+++ b/packages/core/client/src/schema-component/antd/action/Action.Designer.tsx
@ -716,7 +716,7 @@ export const actionSettingsItems: SchemaSettingOptions['items'] = [
            'duplicate',
            'customize:create',
          ].includes(fieldSchema['x-action'] || '');
-          return !isPopupAction && !fieldSchema?.['x-action-settings'].disableSecondConFirm;
+          return !isPopupAction && !fieldSchema?.['x-action-settings']?.disableSecondConFirm;
        },
      },
      {
--- a/packages/plugins/@nocobase/plugin-data-source-main/src/client/e2e/fields/manyToOne/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-main/src/client/e2e/fields/manyToOne/schemaSettings.test.ts
@ -155,7 +155,7 @@ test.describe('table column & sub-table', () => {
  test('title field', async ({ page, mockPage }) => {
    await mockPage(T3377).goto();

-    await page.getByRole('button', { name: 'Add new' }).click();
+    await page.locator('.nb-sub-table-addNew').click();
    await page.getByTestId('select-object-multiple').click();

    // 下拉列表中应该有值
--- a/packages/plugins/@nocobase/plugin-data-source-main/src/client/e2e/fields/singleLineText/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-main/src/client/e2e/fields/singleLineText/schemaSettings.test.ts
@ -138,7 +138,7 @@ test.describe('table column & sub-table in edit form', () => {
      unsupportedVariables: ['Parent popup record'],
      variableValue: ['Current user', 'Nickname'],
      expectVariableValue: async () => {
-        await page.getByRole('button', { name: 'Add new' }).click();
+        await page.locator('.nb-sub-table-addNew').click();
        await expect(
          page
            .getByLabel('block-item-CollectionField-general-form-general.singleLineText-singleLineText')