fix domain tests (#22775)

openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Domains.spec.ts

@@ -420,14 +420,15 @@ test.describe('Domains', () => {
     await afterAction();
   });
 
-  test.fixme(
+  test('Follow/unfollow subdomain and create nested sub domain', async ({
-    'Follow/unfollow subdomain and create nested sub domain',
+    page,
-    async ({ page }) => {
+  }) => {
     const { afterAction, apiContext } = await getApiContext(page);
     const domain = new Domain();
     const subDomain = new SubDomain(domain);
     const nestedSubDomain = new SubDomain(subDomain);
 
+    try {
       await domain.create(apiContext);
       await sidebarClick(page, SidebarItem.DOMAIN);
       await page.reload();
@@ -436,6 +437,10 @@ test.describe('Domains', () => {
       await createSubDomain(page, subDomain.data);
       await redirectToHomePage(page);
       await sidebarClick(page, SidebarItem.DOMAIN);
+      await page.waitForLoadState('networkidle');
+      await page.waitForSelector('[data-testid="loader"]', {
+        state: 'detached',
+      });
       await selectSubDomain(page, domain.data, subDomain.data);
       await verifyDomain(page, subDomain.data, domain.data, false);
       // Follow domain
@@ -472,6 +477,10 @@ test.describe('Domains', () => {
       ).not.toContainText(subDomain.data.displayName);
 
       await sidebarClick(page, SidebarItem.DOMAIN);
+      await page.waitForLoadState('networkidle');
+      await page.waitForSelector('[data-testid="loader"]', {
+        state: 'detached',
+      });
       await selectSubDomain(page, domain.data, subDomain.data);
       await verifyDomain(page, subDomain.data, domain.data, false);
 
@@ -480,11 +489,13 @@ test.describe('Domains', () => {
       await page.getByTestId('subdomains').getByText('Sub Domains').click();
       await page.getByTestId(nestedSubDomain.data.name).click();
       await verifyDomain(page, nestedSubDomain.data, domain.data, false);
-
+    } finally {
+      await nestedSubDomain.delete(apiContext);
+      await subDomain.delete(apiContext);
       await domain.delete(apiContext);
       await afterAction();
     }
-  );
+  });
 
   test('Should clear assets from data products after deletion of data product in Domain', async ({
     page,
@@ -1048,9 +1059,7 @@ test.describe('Data Consumer Domain Ownership', () => {
     await afterAction();
   });
 
-  test.fixme(
+  test('Data consumer can manage domain as owner', async ({ browser }) => {
-    'Data consumer can manage domain as owner',
-    async ({ browser }) => {
     const { page: dataConsumerPage, afterAction: consumerAfterAction } =
       await performUserLogin(browser, testResources.dataConsumerUser);
 
@@ -1058,6 +1067,10 @@ test.describe('Data Consumer Domain Ownership', () => {
       'Check domain management permissions for data consumer owner',
       async () => {
         await sidebarClick(dataConsumerPage, SidebarItem.DOMAIN);
+        await dataConsumerPage.waitForLoadState('networkidle');
+        await dataConsumerPage.waitForSelector('[data-testid="loader"]', {
+          state: 'detached',
+        });
 
         const permissionRes = dataConsumerPage.waitForResponse(
           '/api/v1/permissions/domain/*'
@@ -1071,9 +1084,7 @@ test.describe('Data Consumer Domain Ownership', () => {
 
         await permissionRes;
 
-          await dataConsumerPage
+        await dataConsumerPage.getByTestId('domain-details-add-button').click();
-            .getByTestId('domain-details-add-button')
-            .click();
 
         // check Data Products menu item is visible
         await expect(
@@ -1091,13 +1102,9 @@ test.describe('Data Consumer Domain Ownership', () => {
         );
 
         // Verify the user can edit owner, tags, glossary and domain experts
+        await expect(dataConsumerPage.getByTestId('edit-owner')).toBeVisible();
         await expect(
-            dataConsumerPage.getByTestId('edit-owner')
+          dataConsumerPage.getByTestId('tags-container').getByTestId('add-tag')
-          ).toBeVisible();
-          await expect(
-            dataConsumerPage
-              .getByTestId('tags-container')
-              .getByTestId('add-tag')
         ).toBeVisible();
 
         await expect(
@@ -1107,9 +1114,7 @@ test.describe('Data Consumer Domain Ownership', () => {
         ).toBeVisible();
 
         await expect(
-            dataConsumerPage
+          dataConsumerPage.getByTestId('domain-expert-name').getByTestId('Add')
-              .getByTestId('domain-expert-name')
-              .getByTestId('Add')
         ).toBeVisible();
 
         await expect(
@@ -1125,6 +1130,5 @@ test.describe('Data Consumer Domain Ownership', () => {
     );
 
     await consumerAfterAction();
-    }
+  });
-  );
 });

openmetadata-ui/src/main/resources/ui/playwright/utils/domain.ts

@@ -136,7 +136,11 @@ export const selectSubDomain = async (
   });
 
   if (!isSelected) {
+    const subDomainRes = page.waitForResponse(
+      '/api/v1/search/query?q=*&from=0&size=50&index=domain_search_index&deleted=false'
+    );
     await menuItem.click();
+    await subDomainRes;
     await page.waitForLoadState('networkidle');
   }