Updated Cypress tests

opendatahub-io · Oct 18, 2024 · 549ceb5 · 549ceb5
1 parent e32a974
commit 549ceb5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/frontend/src/__tests__/cypress/cypress/pages/modelServing.ts b/frontend/src/__tests__/cypress/cypress/pages/modelServing.ts
@@ -285,7 +285,7 @@ class InferenceServiceRow extends TableRow {
   findStatusTooltip() {
     return this.find()
       .findByTestId('status-tooltip')
-      .trigger('mouseenter')
+      .click()
       .then(() => {
         cy.findByTestId('model-status-tooltip');
       });
@@ -296,7 +296,7 @@ class InferenceServiceRow extends TableRow {
       .invoke('text')
       .should('contain', msg)
       .then(() => {
-        this.findStatusTooltip().trigger('mouseleave');
+        this.findStatusTooltip().find('button').click();
       });
   }
 

diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/modelServing/servingRuntimeList.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/modelServing/servingRuntimeList.cy.ts
@@ -528,7 +528,7 @@ describe('Serving Runtime List', () => {
         .click();
       modelServingSection.findInferenceServiceTable().should('exist');
       let inferenceServiceRow = modelServingSection.getInferenceServiceRow('OVMS ONNX');
-      inferenceServiceRow.findStatusTooltip().should('be.visible');
+      inferenceServiceRow.findStatusTooltip();
       inferenceServiceRow.findStatusTooltipValue('Failed to pull model from storage due to error');
 
       // Check status of deployed model which loaded successfully after an error

diff --git a/frontend/src/pages/modelServing/screens/global/InferenceServiceStatus.tsx b/frontend/src/pages/modelServing/screens/global/InferenceServiceStatus.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Text, Icon, Popover } from '@patternfly/react-core';
+import { Icon, Popover, Button } from '@patternfly/react-core';
 import {
   CheckCircleIcon,
   ExclamationCircleIcon,
@@ -45,7 +45,6 @@ const InferenceServiceStatus: React.FC<InferenceServiceStatusProps> = ({
             isInline
             tabIndex={0}
             iconSize={iconSize}
-            style={{ cursor: 'pointer' }}
           >
             <CheckCircleIcon />
           </Icon>
@@ -60,7 +59,6 @@ const InferenceServiceStatus: React.FC<InferenceServiceStatusProps> = ({
             isInline
             tabIndex={0}
             iconSize={iconSize}
-            style={{ cursor: 'pointer' }}
           >
             <ExclamationCircleIcon />
           </Icon>
@@ -82,7 +80,6 @@ const InferenceServiceStatus: React.FC<InferenceServiceStatusProps> = ({
             isInline
             tabIndex={0}
             iconSize={iconSize}
-            style={{ cursor: 'pointer' }}
           >
             <OutlinedQuestionCircleIcon />
           </Icon>
@@ -97,26 +94,25 @@ const InferenceServiceStatus: React.FC<InferenceServiceStatusProps> = ({
             isInline
             tabIndex={0}
             iconSize={iconSize}
-            style={{ cursor: 'pointer' }}
           >
             <OutlinedQuestionCircleIcon />
           </Icon>
         );
     }
   };
 
+  const bodyContent = modelStatus?.failedToSchedule
+    ? 'Insufficient resources'
+    : getInferenceServiceStatusMessage(inferenceService);
+
   return (
     <Popover
-      position="right"
-      bodyContent={
-        modelStatus?.failedToSchedule ? (
-          <Text>Insufficient resources</Text>
-        ) : (
-          <Text>{getInferenceServiceStatusMessage(inferenceService)}</Text>
-        )
-      }
+      data-testid="model-status-tooltip"
+      position="top"
+      bodyContent={bodyContent}
+      isVisible={bodyContent ? undefined : false}
     >
-      {statusIcon()}
+      <Button variant="link" isInline icon={statusIcon()} />
     </Popover>
   );
 };