feat(chat-e2e): fixed flaky model image behavior (#2959)

epam · Jan 22, 2025 · 6bfc81b · 6bfc81b
1 parent e88d2a9
commit 6bfc81b
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 16 deletions.
diff --git a/apps/chat-e2e/src/tests/chatHeader.test.ts b/apps/chat-e2e/src/tests/chatHeader.test.ts
@@ -100,7 +100,7 @@ dialTest(
           for (const addonId of addonIds) {
             const expectedAddon = ModelsUtil.getAddon(addonId)!;
             const actualAddon = headerAddonIcons.find(
-              (a) => a.entityName === expectedAddon.name,
+              (a) => a.entityId === expectedAddon.id,
             )!;
             const expectedAddonIcon =
               iconApiHelper.getEntityIcon(expectedAddon);
@@ -148,7 +148,7 @@ dialTest(
         for (const addonId of addonIds) {
           const expectedAddon = ModelsUtil.getAddon(addonId)!;
           const actualAddonInfoIcon = actualAddonsInfoIcons.find(
-            (a) => a.entityName === expectedAddon.name,
+            (a) => a.entityId === expectedAddon.id,
           )!;
           const expectedAddonIcon = iconApiHelper.getEntityIcon(expectedAddon);
           await conversationInfoTooltipAssertion.assertEntityIcon(

diff --git a/apps/chat-e2e/src/tests/compareMode.test.ts b/apps/chat-e2e/src/tests/compareMode.test.ts
@@ -199,8 +199,8 @@ dialTest(
           .toBe(expectedModels.length);
 
         for (const expectedModel of expectedModels) {
-          const actualOptionIcon = compareOptionsIcons.find((o) =>
-            o.entityName.includes(expectedModel.name),
+          const actualOptionIcon = compareOptionsIcons.find(
+            (o) => o.entityId === expectedModel.id,
           )!;
           const expectedModelIcon = iconApiHelper.getEntityIcon(expectedModel);
 

diff --git a/apps/chat-e2e/src/tests/defaultModelSettings.test.ts b/apps/chat-e2e/src/tests/defaultModelSettings.test.ts
@@ -101,7 +101,7 @@ dialTest(
         for (const recentEntityId of recentModelIds) {
           const entity = ModelsUtil.getOpenAIEntity(recentEntityId)!;
           const actualRecentEntity = recentAgentsIcons.find(
-            (e) => e.entityName === entity.name,
+            (e) => e.entityId === entity.id,
           )!;
           const expectedEntityIcon = iconApiHelper.getEntityIcon(entity);
           await baseAssertion.assertEntityIcon(
@@ -161,8 +161,8 @@ dialTest(
 
         for (const addon of recentAddonIds) {
           const addonEntity = ModelsUtil.getAddon(addon)!;
-          const actualRecentAddon = recentAddonsIcons.find((a) =>
-            a.entityName.includes(addonEntity.name),
+          const actualRecentAddon = recentAddonsIcons.find(
+            (a) => a.entityId === addonEntity.id,
           )!;
           const expectedAddonIcon = iconApiHelper.getEntityIcon(addonEntity);
           await agentSettingAssertion.assertEntityIcon(

diff --git a/apps/chat-e2e/src/tests/entityIcon.test.ts b/apps/chat-e2e/src/tests/entityIcon.test.ts
@@ -64,8 +64,8 @@ dialTest(
         .soft(actualIcons.length, ExpectedMessages.entitiesIconsCountIsValid)
         .toBe(allExpectedEntities.length);
 
-      const actualEntity = actualIcons.find((e) =>
-        e.entityName.includes(randomEntity.name),
+      const actualEntity = actualIcons.find(
+        (e) => e.entityId === randomEntity.id,
       )!;
       const expectedEntityIcon = iconApiHelper.getEntityIcon(randomEntity);
       await marketplaceAgentsAssertion.assertEntityIcon(
@@ -91,7 +91,7 @@ dialTest(
 
         const randomAddon = GeneratorUtil.randomArrayElement(expectedAddons);
         const actualAddon = actualAddonsIcons.find(
-          (a) => a.entityName === randomAddon.name,
+          (a) => a.entityId === randomAddon.id,
         )!;
         const expectedAddonIcon = iconApiHelper.getEntityIcon(randomAddon);
         await addonsDialogAssertion.assertEntityIcon(

diff --git a/apps/chat-e2e/src/tests/overlay/overlayAuth.ts b/apps/chat-e2e/src/tests/overlay/overlayAuth.ts
@@ -23,7 +23,7 @@ for (let i = 0; i < overlayUsernames.length; i++) {
     setTestIds('EPMRTC-3785');
     const overlayLoginPage = new OverlayLoginPage(page);
     await overlayLoginPage.navigateToUrl(
-      OverlaySandboxUrls.modelIdSetSandboxUrl,
+      OverlaySandboxUrls.disableAllFeaturesUrl,
     );
     const newPage = await overlayLoginPage.clickLoginButton();
 

diff --git a/apps/chat-e2e/src/ui/domData/attributes.ts b/apps/chat-e2e/src/ui/domData/attributes.ts
@@ -16,6 +16,6 @@ export enum Attributes {
   download = 'download',
   href = 'href',
   dataQA = 'data-qa',
-  dataImageName = 'data-image-name',
   ariaSelected = 'aria-selected',
+  id = 'id',
 }
diff --git a/apps/chat-e2e/src/ui/webElements/baseElement.ts b/apps/chat-e2e/src/ui/webElements/baseElement.ts
@@ -8,7 +8,7 @@ import path from 'path';
 export const elementIndexExceptionError = 'Element index should start from 1';
 
 export interface EntityIcon {
-  entityName: string;
+  entityId: string;
   iconLocator: Locator;
 }
 
@@ -213,11 +213,11 @@ export class BaseElement {
     for (let i = 1; i <= elementsCount; i++) {
       const element = elements.getNthElement(i);
       const elementIconLocator = this.getElementIcon(element);
-      const elementIconName = await elementIconLocator.getAttribute(
-        Attributes.dataImageName,
+      const elementIconId = await elementIconLocator.getAttribute(
+        Attributes.id,
       );
       allIcons.push({
-        entityName: elementIconName!,
+        entityId: elementIconId!,
         iconLocator: elementIconLocator,
       });
     }

diff --git a/apps/chat/src/components/Chatbar/ModelIcon.tsx b/apps/chat/src/components/Chatbar/ModelIcon.tsx
@@ -77,6 +77,7 @@ const ModelIconTemplate = memo(
           data-image-name={description}
           ref={ref}
           style={{ height: `${size}px`, width: `${size}px` }}
+          id={entityId}
         />
       </span>
     );