diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/TeamsDragAndDrop.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/TeamsDragAndDrop.spec.ts index 65c3c0406cbd..2dfc2602c001 100644 --- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/TeamsDragAndDrop.spec.ts +++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/TeamsDragAndDrop.spec.ts @@ -216,7 +216,7 @@ test.describe( await waitForAllLoadersToDisappear(page); - await hardDeleteTeam(page); + await hardDeleteTeam(page, teamName); // Validate the deleted team await expect( diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Teams.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Teams.spec.ts index cdfdcfaf3252..42373156ced0 100644 --- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Teams.spec.ts +++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Teams.spec.ts @@ -387,7 +387,7 @@ test.describe('Teams Page', () => { teamDetails?.updatedName ?? '' ); - await hardDeleteTeam(page); + await hardDeleteTeam(page, teamDetails?.updatedName ?? teamDetails.name); }); }); @@ -501,7 +501,10 @@ test.describe('Teams Page', () => { team.responseData?.['displayName'] ); - await hardDeleteTeam(page); + await hardDeleteTeam( + page, + team.responseData?.['displayName'] ?? team.data.name + ); await afterAction(); }); @@ -765,7 +768,7 @@ test.describe('Teams Page', () => { page.getByTestId('team-hierarchy-table').getByRole('link') ).toContainText(team2Details.displayName); - await hardDeleteTeam(page); + await hardDeleteTeam(page, team1Details.name); }); test('Total User Count should be rendered', async ({ page }) => { diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/team.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/team.ts index 40b0701d268e..ff5069814fe5 100644 --- a/openmetadata-ui/src/main/resources/ui/playwright/utils/team.ts +++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/team.ts @@ -21,7 +21,6 @@ import { assignDomain, descriptionBox, redirectToHomePage, - toastNotification, uuid, } from './common'; import { @@ -133,12 +132,11 @@ export const softDeleteTeam = async (page: Page) => { await page.click('[data-testid="confirm-button"]'); - await deleteResponse; - - await toastNotification(page, /deleted successfully!/); + const response = await deleteResponse; + expect(response.status()).toBe(200); }; -export const hardDeleteTeam = async (page: Page) => { +export const hardDeleteTeam = async (page: Page, teamName: string) => { await page .getByTestId('team-details-collapse') .getByTestId('manage-button') @@ -159,9 +157,10 @@ export const hardDeleteTeam = async (page: Page) => { await page.click('[data-testid="confirm-button"]'); - await deleteResponse; + const response = await deleteResponse; + expect(response.status()).toBe(200); - await toastNotification(page, /deleted successfully!/); + await searchTeam(page, teamName, { expectEmptyResults: true }); }; export const getNewTeamDetails = (teamName: string) => {