Skip to content

Commit 187cc8e

Browse files
gimmyhehekagol
authored andcommitted
test: update @playwright/test to 1.49.x and fix e2e case (#2792)
* test: update @playwright/test to 1.49.x * test(grid): fix grid e2e test case * test(grid): fix grid e2e test case
1 parent 818ec3a commit 187cc8e

35 files changed

+88
-201
lines changed

examples/docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
"sortablejs": "1.15.0"
2121
},
2222
"devDependencies": {
23-
"@playwright/test": "~1.42.0"
23+
"@playwright/test": "catalog:"
2424
}
2525
}

examples/sites/demos/pc/app/grid/custom/column-fixed.spec.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ import { test, expect } from '@playwright/test'
22

33
test('列冻结', async ({ page }) => {
44
page.on('pageerror', (exception) => expect(exception).toBeNull())
5+
const custom = page.locator('.tiny-grid-custom')
56
await page.goto('grid-custom#custom-column-fixed')
67
await page.locator('.tiny-grid-custom__setting-btn').click()
7-
await page.getByRole('row', { name: '员工数 显示 未冻结' }).getByTitle('未冻结').getByRole('img').click()
8-
await page.getByRole('row', { name: '员工数 显示 左冻结' }).getByTitle('左冻结').getByRole('img').click()
8+
await custom.getByRole('row', { name: '员工数 ' }).getByTitle('未冻结').getByRole('img').click()
9+
await custom.getByRole('row', { name: '员工数' }).getByTitle('左冻结').getByRole('img').click()
910
await page.getByRole('button', { name: '确定' }).click()
1011
await expect(page.getByRole('cell', { name: '员工数' })).toHaveCSS('right', '0px')
1112
})

examples/sites/demos/pc/app/grid/custom/column-sort.spec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ import { test, expect } from '@playwright/test'
22

33
test('个性化排序测试', async ({ page }) => {
44
page.on('pageerror', (exception) => expect(exception).toBeNull())
5+
const custom = page.locator('.tiny-grid-custom')
56
await page.goto('grid-custom#custom-column-sort')
67
await page.locator('.tiny-grid-custom__setting-btn').click()
7-
await page.getByRole('row', { name: '员工数 显示 未排序 未冻结' }).getByTitle('未排序').getByRole('img').click()
8+
await custom.getByRole('row', { name: '员工数' }).getByTitle('未排序').getByRole('img').click()
89
await page.getByRole('button', { name: '确定' }).click()
910
await page.waitForTimeout(200)
1011
const sortBtn = await page.getByRole('cell', { name: '员工数' }).getByRole('img')

examples/sites/demos/pc/app/grid/custom/column-visible-hidden.spec.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ import { test, expect } from '@playwright/test'
22

33
test('列显示隐藏', async ({ page }) => {
44
page.on('pageerror', (exception) => expect(exception).toBeNull())
5+
const custom = page.locator('.tiny-grid-custom')
56
await page.goto('grid-custom#custom-column-visible-hidden')
67
await page.locator('.tiny-grid-custom__setting-btn').click()
7-
await page.getByRole('row', { name: '员工数 显示 未冻结' }).getByTitle('显示').getByRole('img').click()
8-
await page.getByRole('button', { name: '确定' }).click()
8+
await custom.getByRole('row', { name: '员工数' }).getByTitle('显示').getByRole('img').click()
9+
await custom.getByRole('button', { name: '确定' }).click()
910
await expect(page.getByRole('cell', { name: '员工数' })).not.toBeVisible()
1011
})

examples/sites/demos/pc/app/grid/custom/multiple-column-sort.spec.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@ import { test, expect } from '@playwright/test'
22

33
test('多列排序', async ({ page }) => {
44
page.on('pageerror', (exception) => expect(exception).toBeNull())
5+
const custom = page.locator('.tiny-grid-custom')
56
await page.goto('grid-custom#custom-multiple-column-sort')
67
await page.locator('.tiny-grid-custom__setting-btn').first().click()
7-
await page.getByRole('row', { name: '员工数 显示 未排序 未冻结' }).getByTitle('未排序').locator('path').click()
8-
await page.getByTitle('未排序').locator('path').click()
9-
await page.getByRole('button', { name: '确定' }).click()
8+
await custom.getByRole('row', { name: '员工数' }).getByTitle('未排序').locator('path').click()
9+
await custom.getByTitle('未排序').locator('path').click()
10+
await custom.getByRole('button', { name: '确定' }).click()
1011
await expect(page.locator('.tiny-grid-body__row').nth(3)).toContainText('GFD 科技有限公司')
1112

1213
await page.locator('.tiny-grid-custom__setting-btn').nth(1).click()
13-
await page.getByRole('row', { name: '员工数 显示 未排序 未冻结' }).getByTitle('未排序').getByRole('img').click()
14-
await page.getByTitle('未排序').getByRole('img').click()
15-
await page.getByRole('button', { name: '确定' }).click()
14+
await custom.getByRole('row', { name: '员工数' }).getByTitle('未排序').getByRole('img').click()
15+
await custom.getByTitle('未排序').getByRole('img').click()
16+
await custom.getByRole('button', { name: '确定' }).click()
1617
await expect(page.locator('.tiny-grid-body__row').nth(10)).toContainText('YHN 科技有限公司')
1718
})

examples/sites/demos/pc/app/grid/custom/ordercolumn-local.spec.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@ import { test, expect } from '@playwright/test'
22

33
test('个性化按钮点击事件', async ({ page }) => {
44
page.on('pageerror', (exception) => expect(exception).toBeNull())
5+
const custom = page.locator('.tiny-grid-custom')
56
await page.goto('grid-custom#custom-ordercolumn-local')
67
await page.locator('.tiny-grid-custom__setting-btn').click()
7-
await page.getByRole('cell', { name: '显示 未冻结' }).getByTitle('显示').getByRole('img').click()
8-
await page.getByRole('button', { name: '确定' }).click()
8+
await custom.locator('.tiny-grid-body__row').first().getByTitle('显示').getByRole('img').click()
9+
await custom.getByRole('button', { name: '确定' }).click()
910
await expect(
1011
page.getByText('点击了确认按钮{"sortType":"page","pageSize":10,"columns":[{"property":"name","order":nu')
1112
).toBeVisible()
1213
await page.getByRole('button', { name: '确定' }).click()
1314
await page.locator('.tiny-grid-custom__setting-btn').click()
14-
await page.getByRole('button', { name: '重置' }).click()
15+
await custom.getByRole('button', { name: '重置' }).click()
1516
await expect(page.getByText('点击了重置按钮')).toBeVisible()
1617
await page.getByRole('button', { name: '确定' }).nth(1).click()
17-
await page.getByRole('button', { name: '取消' }).click()
18+
await custom.getByRole('button', { name: '取消' }).click()
1819
await expect(page.getByText('点击了取消按钮 undefined')).toBeVisible
1920
})

examples/sites/demos/pc/app/grid/custom/reset-resizable.spec.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ test.describe('手动重置列操作', () => {
3030

3131
test('重置列隐藏', async ({ page }) => {
3232
page.on('pageerror', (exception) => expect(exception).toBeNull())
33+
const custom = page.locator('.tiny-grid-custom')
34+
3335
await page.goto('grid-custom#custom-reset-resizable')
3436
await page.locator('.tiny-grid-custom__setting-btn').click()
35-
await page.getByRole('row', { name: '员工数 显示 未冻结' }).getByTitle('显示').getByRole('img').click()
36-
await page.getByRole('button', { name: '确定' }).click()
37+
await custom.getByRole('row', { name: '员工数' }).getByTitle('显示').getByRole('img').click()
38+
await custom.getByRole('button', { name: '确定' }).click()
3739
const thHeader = page.locator('th.tiny-grid-header__column').nth(1)
3840
await expect(thHeader).toContainText('地址')
3941
await page.getByRole('button', { name: '重置列的隐藏操作' }).click()

examples/sites/demos/pc/app/grid/edit/custom-editing.spec.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,5 @@ test('自定义编辑规则', async ({ page }) => {
66
await page.getByText('GFD 科技 YX 公司').first().click()
77
await expect(page.getByText('GFD 科技 YX 公司').first()).toBeVisible()
88
await page.getByText('WWWW 科技 YX 公司').first().click()
9-
await expect(
10-
page
11-
.getByRole('row', {
12-
name: '2 华南区 2014-02-14 14:14:14 1300 公司技术和研发实力雄厚,是国家 863 项目的参与者,并被政府认定为“高新技术企业”。'
13-
})
14-
.getByRole('textbox')
15-
).toBeVisible()
9+
await expect(page.locator('.tiny-grid-default-input')).toBeVisible()
1610
})

examples/sites/demos/pc/app/grid/edit/editing.spec.js

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,7 @@ test('编辑方式', async ({ page }) => {
55
await page.goto('grid-edit#edit-editing')
66
// 单元格编辑
77
await page.getByRole('cell', { name: 'GFD 科技 YX 公司' }).first().click()
8-
await page
9-
.getByRole('row', {
10-
name: '1 华东区 福州 公司技术和研发实力雄厚,是国家 863 项目的参与者,并被政府认定为“高新技术企业”。'
11-
})
12-
.getByRole('textbox')
13-
.click()
14-
await page
15-
.getByRole('row', {
16-
name: '1 华东区 福州 公司技术和研发实力雄厚,是国家 863 项目的参与者,并被政府认定为“高新技术企业”。'
17-
})
18-
.getByRole('textbox')
19-
.fill('GFD 科技 Y 水电费第三方 X 公司')
8+
await page.locator('.tiny-grid-default-input').fill('GFD 科技 Y 水电费第三方 X 公司')
209
await page.getByRole('heading', { name: '单元格编辑:' }).click()
2110
await expect(await page.getByText('GFD 科技 Y 水电费第三方 X 公司')).toHaveCount(2)
2211

examples/sites/demos/pc/app/grid/edit/has-row-change.spec.js

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@ import { test, expect } from '@playwright/test'
22

33
test('检查数据是否改变', async ({ page }) => {
44
page.on('pageerror', (exception) => expect(exception).toBeNull())
5+
const demo = page.locator('#edit-has-row-change')
56
await page.goto('grid-edit#edit-has-row-change')
6-
await page.getByText('GFD 科技 YX 公司').first().click()
7-
await page.getByRole('row', { name: '1 保存' }).locator('input[type="text"]').fill('sdf')
8-
await page.getByRole('row', { name: '1 保存' }).getByRole('button', { name: '保存' }).click()
7+
await demo.getByText('GFD 科技 YX 公司').first().click()
8+
await demo.locator('.tiny-grid-body__row').first().locator('input[type="text"]').fill('sdf')
9+
await demo.locator('.tiny-grid-body__row').first().getByRole('button', { name: '保存' }).click()
910
await expect(page.getByText('保存成功!')).toBeVisible()
1011
await page.getByRole('button', { name: '确定' }).click()
11-
await page
12-
.getByRole('row', {
13-
name: '2 WWWW 科技 YX 公司 华南区 深圳福田区 公司技术和研发实力雄厚,是国家 863 项目的参与者,并被政府认定为“高新技术企业”。 保存'
14-
})
15-
.getByRole('button', { name: '保存' })
16-
.click()
12+
await demo.locator('.tiny-grid-body__row').nth(1).getByRole('button', { name: '保存' }).click()
1713
await expect(page.getByText('当前数据未改变!')).toBeVisible()
1814
await page.getByRole('button', { name: '确定' }).click()
1915
})

0 commit comments

Comments
 (0)