Skip to content

Commit 882f933

Browse files
committed
feat(FR-636): fix create test code
1 parent 664865a commit 882f933

2 files changed

Lines changed: 33 additions & 26 deletions

File tree

e2e/test-util.ts

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -127,36 +127,31 @@ export async function createVFolderAndVerify(
127127
folderName: string,
128128
usageMode: 'general' | 'model' = 'general',
129129
type: 'user' | 'project' = 'user',
130-
permission: 'rw' | 'ro' | 'wd' = 'rw',
130+
permission: 'rw' | 'ro' = 'rw',
131131
) {
132-
const permissionMap = {
133-
rw: 'Read & Write',
134-
ro: 'Read only',
135-
wd: 'Delete',
136-
};
137132
await navigateTo(page, 'data');
138133

139-
await page.getByRole('button', { name: 'plus Add' }).click();
134+
await page.getByRole('button', { name: 'Create Folder' }).nth(1).click();
140135
await page.getByRole('textbox', { name: 'Folder name' }).fill(folderName);
136+
141137
// select parsed parameters in create modal form
142-
await page.getByRole('radio', { name: usageMode }).click();
143-
await page.getByRole('radio', { name: type }).click();
144-
await page.getByRole('radio', { name: permissionMap[permission] }).click();
138+
await page.getByTestId(`${usageMode}-usage-mode`).click();
139+
await page.getByTestId(`${type}-type`).click();
140+
await page.getByTestId(`${permission}-permission`).click();
145141

146142
await page.getByRole('button', { name: 'Create', exact: true }).click();
147143
await page.reload();
148-
const nameInput = page
149-
.locator('#general-folder-storage vaadin-grid-cell-content')
150-
.filter({ hasText: 'Name' })
151-
.locator('vaadin-text-field')
152-
.nth(1)
153-
.locator('input');
154-
await nameInput.click();
155-
await nameInput.fill(folderName);
144+
await page.locator('#react-root').getByTitle('Name').click();
145+
await page.getByRole('option', { name: 'Name' }).locator('div').click();
146+
await page.locator('#rc_select_8').click();
147+
await page.locator('#rc_select_8').fill(folderName);
148+
await page.getByRole('button', { name: 'search' }).click();
149+
await page.getByRole('link', { name: folderName }).click();
156150
await expect(
157-
page.locator('vaadin-grid-cell-content').filter({ hasText: folderName }),
151+
page
152+
.getByRole('cell', { name: `VFolder Identicon ${folderName}` })
153+
.filter({ hasText: folderName }),
158154
).toBeVisible();
159-
await nameInput.fill('');
160155
}
161156

162157
export async function deleteVFolderAndVerify(page: Page, folderName: string) {

react/src/components/FolderCreateModal.tsx

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,13 @@ const FolderCreateModal: React.FC<FolderCreateModalProps> = ({
255255

256256
<Form.Item label={t('data.UsageMode')} name={'usage_mode'}>
257257
<Radio.Group>
258-
<Radio value={'general'}>General</Radio>
258+
<Radio value={'general'} data-testid="general-usage-mode">
259+
General
260+
</Radio>
259261
{baiClient._config.enableModelFolders ? (
260-
<Radio value={'model'}>Model</Radio>
262+
<Radio value={'model'} data-testid="model-usage-mode">
263+
Model
264+
</Radio>
261265
) : null}
262266
</Radio.Group>
263267
</Form.Item>
@@ -276,11 +280,15 @@ const FolderCreateModal: React.FC<FolderCreateModalProps> = ({
276280
* so we need both checks for proper access control
277281
*/}
278282
{_.includes(allowedTypes, 'user') ? (
279-
<Radio value={'user'}>User</Radio>
283+
<Radio value={'user'} data-testid="user-type">
284+
User
285+
</Radio>
280286
) : null}
281287
{(userRole === 'admin' || userRole === 'superadmin') &&
282288
_.includes(allowedTypes, 'group') ? (
283-
<Radio value={'project'}>Project</Radio>
289+
<Radio value={'project'} data-testid="project-type">
290+
Project
291+
</Radio>
284292
) : null}
285293
</Radio.Group>
286294
</Form.Item>
@@ -305,8 +313,12 @@ const FolderCreateModal: React.FC<FolderCreateModalProps> = ({
305313

306314
<Form.Item label={t('data.Permission')} name={'permission'}>
307315
<Radio.Group>
308-
<Radio value={'rw'}>Read & Write</Radio>
309-
<Radio value={'ro'}>Read Only</Radio>
316+
<Radio value={'rw'} data-testid="rw-permission">
317+
Read & Write
318+
</Radio>
319+
<Radio value={'ro'} data-testid="ro-permission">
320+
Read Only
321+
</Radio>
310322
</Radio.Group>
311323
</Form.Item>
312324

0 commit comments

Comments
 (0)