feat(chat-e2e): new conversation on refresh tests

apps/chat-e2e/src/assertions/conversationAssertion.ts

@@ -6,7 +6,6 @@ import {
   TreeEntity,
 } from '@/src/testData';
 import { Colors, Styles } from '@/src/ui/domData';
-import { ChatBarSelectors } from '@/src/ui/selectors';
 import { ConversationsTree } from '@/src/ui/webElements/entityTree';
 import { expect } from '@playwright/test';
 
@@ -53,33 +52,12 @@ export class ConversationAssertion extends SideBarEntityAssertion<ConversationsT
   }
 
   public async assertNoConversationIsSelected() {
-    const entitiesWithIndices =
-      await this.sideBarEntitiesTree.getAllTreeEntitiesWithIndices();
-    const selectedEntities = [];
-
-    for (const { name, index } of entitiesWithIndices) {
-      const hasSelectedClass =
-        (await this.sideBarEntitiesTree
-          .getEntityByName(name, index)
-          .locator(ChatBarSelectors.selectedEntity)
-          .count()) > 0;
-
-      const entityBackgroundColor =
-        await this.sideBarEntitiesTree.getEntityBackgroundColor(name, index);
-
-      if (
-        hasSelectedClass ||
-        entityBackgroundColor === Colors.backgroundAccentSecondary
-      ) {
-        selectedEntities.push({ name, index });
-      }
-    }
-
+    const selectedEntities =
+      await this.sideBarEntitiesTree.getSelectedEntities();
     expect
       .soft(selectedEntities.length, ExpectedMessages.noConversationIsSelected)
       .toBe(0);
   }
-
   public async assertConversationInToday(conversationName: string) {
     const todayConversations =
       await this.sideBarEntitiesTree.getChronologyConversations(

apps/chat-e2e/src/assertions/sideBarEntityAssertion.ts

@@ -68,7 +68,11 @@ export class SideBarEntityAssertion<
     if (actualCount === undefined) {
       await this.assertElementsCount(this.sideBarEntitiesTree, expectedCount);
     } else {
-      await this.assertCount(expectedCount, actualCount);
+      this.assertValue(
+        expectedCount,
+        actualCount,
+        ExpectedMessages.elementsCountIsValid,
+      );
     }
   }
 }

apps/chat-e2e/src/tests/newConversationOnRefresh.test.ts

@@ -62,8 +62,8 @@ dialTest(
         });
         await dialHomePage.waitForPageLoaded();
         await chat.getSendMessage().waitForState({ state: 'attached' });
-        await chat.changeAgentButton.waitForState({ state: 'visible' });
-        await chat.configureSettingsButton.waitForState({ state: 'visible' });
+        await chat.changeAgentButton.waitForState();
+        await chat.configureSettingsButton.waitForState();
         await conversationAssertion.assertNoConversationIsSelected();
       },
     );
@@ -81,8 +81,8 @@ dialTest(
       'Verify nothing changes after going back to chat',
       async () => {
         await dialHomePage.waitForPageLoaded();
-        await chat.changeAgentButton.waitForState({ state: 'visible' });
-        await chat.configureSettingsButton.waitForState({ state: 'visible' });
+        await chat.changeAgentButton.waitForState();
+        await chat.configureSettingsButton.waitForState();
         await conversationAssertion.assertNoConversationIsSelected();
       },
     );
@@ -139,8 +139,8 @@ dialTest(
       async () => {
         await dialHomePage.reloadPage();
         await dialHomePage.waitForPageLoaded();
-        await chat.changeAgentButton.waitForState({ state: 'visible' });
-        await chat.configureSettingsButton.waitForState({ state: 'visible' });
+        await chat.changeAgentButton.waitForState();
+        await chat.configureSettingsButton.waitForState();
         await conversationAssertion.assertNoConversationIsSelected();
       },
     );
@@ -153,8 +153,8 @@ dialTest(
 
     await dialTest.step('Verify chat stays selected', async () => {
       await dialHomePage.waitForPageLoaded();
-      await chat.changeAgentButton.waitForState({ state: 'visible' });
-      await chat.configureSettingsButton.waitForState({ state: 'visible' });
+      await chat.changeAgentButton.waitForState();
+      await chat.configureSettingsButton.waitForState();
       await conversationAssertion.assertSelectedConversation(
         initialConversationName,
       );
@@ -166,8 +166,8 @@ dialTest(
       async () => {
         await dialHomePage.reloadPage();
         await dialHomePage.waitForPageLoaded();
-        await chat.changeAgentButton.waitForState({ state: 'visible' });
-        await chat.configureSettingsButton.waitForState({ state: 'visible' });
+        await chat.changeAgentButton.waitForState();
+        await chat.configureSettingsButton.waitForState();
         await conversationAssertion.assertSelectedConversation(
           initialConversationName,
         );
@@ -183,8 +183,8 @@ dialTest(
         );
         await dialHomePage.reloadPage();
         await dialHomePage.waitForPageLoaded();
-        await chat.changeAgentButton.waitForState({ state: 'visible' });
-        await chat.configureSettingsButton.waitForState({ state: 'visible' });
+        await chat.changeAgentButton.waitForState();
+        await chat.configureSettingsButton.waitForState();
         await conversationAssertion.assertNoConversationIsSelected();
       },
     );
@@ -259,8 +259,8 @@ dialTest(
         });
         await dialHomePage.waitForPageLoaded();
         await chat.getSendMessage().waitForState({ state: 'attached' });
-        await chat.changeAgentButton.waitForState({ state: 'visible' });
-        await chat.configureSettingsButton.waitForState({ state: 'visible' });
+        await chat.changeAgentButton.waitForState();
+        await chat.configureSettingsButton.waitForState();
         await conversationAssertion.assertNoConversationIsSelected();
       },
     );
@@ -282,8 +282,8 @@ dialTest(
       async () => {
         await dialHomePage.reloadPage();
         await dialHomePage.waitForPageLoaded();
-        await chat.changeAgentButton.waitForState({ state: 'visible' });
-        await chat.configureSettingsButton.waitForState({ state: 'visible' });
+        await chat.changeAgentButton.waitForState();
+        await chat.configureSettingsButton.waitForState();
         await conversationAssertion.assertNoConversationIsSelected();
       },
     );
@@ -298,8 +298,8 @@ dialTest(
         await chat.changeAgentButton.hoverOver();
         await dialHomePage.reloadPage();
         await dialHomePage.waitForPageLoaded();
-        await chat.changeAgentButton.waitForState({ state: 'visible' });
-        await chat.configureSettingsButton.waitForState({ state: 'visible' });
+        await chat.changeAgentButton.waitForState();
+        await chat.configureSettingsButton.waitForState();
         await conversationAssertion.assertNoConversationIsSelected();
       },
     );
@@ -314,8 +314,8 @@ dialTest(
         await chat.changeAgentButton.hoverOver();
         await dialHomePage.reloadPage();
         await dialHomePage.waitForPageLoaded();
-        await chat.changeAgentButton.waitForState({ state: 'visible' });
-        await chat.configureSettingsButton.waitForState({ state: 'visible' });
+        await chat.changeAgentButton.waitForState();
+        await chat.configureSettingsButton.waitForState();
         await conversationAssertion.assertNoConversationIsSelected();
       },
     );

apps/chat-e2e/src/ui/webElements/entityTree/entitiesTree.ts

@@ -36,33 +36,10 @@ export class EntitiesTree extends BaseElement {
     return names;
   }
 
-  public async getAllTreeEntitiesWithIndices(): Promise<
-    { name: string; index: number }[]
-  > {
-    const entities = await this.getAllTreeEntities();
-    const namesWithIndices: { name: string; index: number }[] = [];
-    const nameOccurrences: Record<string, number> = {};
-
-    for (const entity of entities) {
-      const nameElement = entity.locator(EntitySelectors.entityName);
-      const name = await nameElement.textContent();
-      if (name) {
-        nameOccurrences[name] = (nameOccurrences[name] || 0) + 1;
-        namesWithIndices.push({
-          name,
-          index: nameOccurrences[name],
-        });
-      }
-    }
-
-    return namesWithIndices;
-  }
-
   public async getAllTreeEntities(): Promise<Locator[]> {
-    const allEntities = this.getChildElementBySelector(this.entitySelector)
+    return this.getChildElementBySelector(this.entitySelector)
       .getElementLocator()
       .all();
-    return allEntities;
   }
 
   getTreeEntity(
@@ -106,10 +83,6 @@ export class EntitiesTree extends BaseElement {
     );
   }
 
-  test() {
-    return this.getElementLocator().locator(EntitySelectors.entityName);
-  }
-
   getEntityCheckbox(name: string, index?: number) {
     return this.getEntityByName(name, index).getByRole('checkbox');
   }

apps/chat-e2e/src/ui/webElements/entityTree/sidebar/baseSideBarConversationTree.ts

@@ -1,4 +1,5 @@
 import { isApiStorageType } from '@/src/hooks/global-setup';
+import { Colors } from '@/src/ui/domData';
 import { ChatBarSelectors } from '@/src/ui/selectors';
 import { SideBarEntitiesTree } from '@/src/ui/webElements/entityTree/sidebar/sideBarEntitiesTree';
 
@@ -24,4 +25,32 @@ export class BaseSideBarConversationTree extends SideBarEntitiesTree {
       ChatBarSelectors.selectedEntity,
     );
   }
+
+  public async getSelectedEntities(): Promise<
+    { name: string; index?: number }[]
+  > {
+    const allNames = await this.getAllTreeEntitiesNames();
+    const selectedEntities = [];
+
+    for (const name of allNames) {
+      const hasSelectedClass = await this.isEntitySelected(name);
+      const backgroundColor = await this.getEntityBackgroundColor(name);
+
+      if (
+        hasSelectedClass ||
+        backgroundColor === Colors.backgroundAccentSecondary
+      ) {
+        selectedEntities.push({ name });
+      }
+    }
+    return selectedEntities;
+  }
+
+  public async isEntitySelected(name: string): Promise<boolean> {
+    return (
+      (await this.getEntityByExactName(name)
+        .locator(ChatBarSelectors.selectedEntity)
+        .count()) > 0
+    );
+  }
 }