diff --git a/packages/nc-gui/components/roles/Selector.vue b/packages/nc-gui/components/roles/Selector.vue index 274a6c01a3..3f4486d9cd 100644 --- a/packages/nc-gui/components/roles/Selector.vue +++ b/packages/nc-gui/components/roles/Selector.vue @@ -17,9 +17,9 @@ const inheritRef = toRef(props, 'inherit') diff --git a/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts b/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts index 7c66bffb6f..8f3da39ed3 100644 --- a/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts +++ b/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts @@ -22,11 +22,11 @@ export class AccessSettingsPage extends BasePage { if (userEmail === email) { const roleDropdown = user.locator('.nc-collaborator-role-select'); - const selectedRole = await user.locator('.nc-collaborator-role-select').innerText(); + const selectedRole = await user.locator('.nc-collaborator-role-select .badge-text').innerText(); await roleDropdown.click(); - const menu = this.rootPage.locator('.ant-select-dropdown:visible'); - const clickClbk = () => menu.locator(`.ant-select-item:has-text("${role}"):visible`).last().click(); + const menu = this.rootPage.locator('.nc-role-select-dropdown:visible'); + const clickClbk = () => menu.locator(`.nc-role-select-${role.toLowerCase()}:visible`).last().click(); if (networkValidation && !selectedRole.includes(role)) { await this.waitForResponse({ diff --git a/tests/playwright/setup/index.ts b/tests/playwright/setup/index.ts index 6d8eb61c19..f0d28739b1 100644 --- a/tests/playwright/setup/index.ts +++ b/tests/playwright/setup/index.ts @@ -384,7 +384,7 @@ const setup = async ({ email: `user@nocodb.com`, password: getDefaultPwd(), }); - await axios.post(`http://localhost:8080/api/v1/license`, { key: '' }, { headers: { 'xc-auth': admin.data.token } }); + if (!isEE()) await axios.post(`http://localhost:8080/api/v1/license`, { key: '' }, { headers: { 'xc-auth': admin.data.token } }); } catch (e) { // ignore error: some roles will not have permission for license reset // console.error(`Error resetting project: ${process.env.TEST_PARALLEL_INDEX}`, e);