test fixes

Opentrons · Aug 12, 2024 · 5a11613 · 5a11613
1 parent ef561f7
commit 5a11613
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 22 deletions.
diff --git a/app/src/organisms/ErrorRecoveryFlows/RecoveryOptions/ManageTips.tsx b/app/src/organisms/ErrorRecoveryFlows/RecoveryOptions/ManageTips.tsx
@@ -24,7 +24,6 @@ import { DropTipWizardFlows } from '../../DropTipWizardFlows'
 import { DT_ROUTES } from '../../DropTipWizardFlows/constants'
 import { SelectRecoveryOption } from './SelectRecoveryOption'
 
-import type { PipettingRunTimeCommand } from '@opentrons/shared-data'
 import type { PipetteWithTip } from '../../DropTipWizardFlows'
 import type { RecoveryContentProps, RecoveryRoute, RouteStep } from '../types'
 import type { FixitCommandTypeUtils } from '../../DropTipWizardFlows/types'
@@ -201,7 +200,6 @@ export function useDropTipFlowUtils({
   subMapUtils,
   routeUpdateActions,
   recoveryMap,
-  failedPipetteInfo,
 }: RecoveryContentProps): FixitCommandTypeUtils {
   const { t } = useTranslation('error_recovery')
   const {

diff --git a/app/src/organisms/ErrorRecoveryFlows/__tests__/RecoveryError.test.tsx b/app/src/organisms/ErrorRecoveryFlows/__tests__/RecoveryError.test.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable testing-library/prefer-presence-queries */
 import * as React from 'react'
 import { describe, it, vi, expect, beforeEach } from 'vitest'
 import { screen, fireEvent } from '@testing-library/react'
@@ -48,63 +49,63 @@ describe('RecoveryError', () => {
       RECOVERY_MAP.ERROR_WHILE_RECOVERING.STEPS.RECOVERY_ACTION_FAILED
     render(props)
 
-    expect(screen.getByText('Retry step failed')).toBeInTheDocument()
+    expect(screen.queryAllByText('Retry step failed')[0]).toBeInTheDocument()
     expect(
-      screen.getByText(
+      screen.queryAllByText(
         'Next, you can try another recovery action or cancel the run.'
-      )
+      )[0]
     ).toBeInTheDocument()
-    expect(screen.getByText('Back to menu')).toBeInTheDocument()
+    expect(screen.queryAllByText('Back to menu')[0]).toBeInTheDocument()
   })
 
   it(`renders RecoveryDropTipFlowErrors when step is ${ERROR_WHILE_RECOVERING.STEPS.DROP_TIP_GENERAL_ERROR}`, () => {
     props.recoveryMap.step =
       RECOVERY_MAP.ERROR_WHILE_RECOVERING.STEPS.DROP_TIP_GENERAL_ERROR
     render(props)
 
-    expect(screen.getByText('Retry step failed')).toBeInTheDocument()
+    expect(screen.queryAllByText('Retry step failed')[0]).toBeInTheDocument()
     expect(
-      screen.getByText(
+      screen.queryAllByText(
         'Next, you can try another recovery action or cancel the run.'
-      )
+      )[0]
     ).toBeInTheDocument()
-    expect(screen.getByText('Return to menu')).toBeInTheDocument()
+    expect(screen.queryAllByText('Return to menu')[0]).toBeInTheDocument()
   })
 
   it(`renders RecoveryDropTipFlowErrors when step is ${ERROR_WHILE_RECOVERING.STEPS.DROP_TIP_BLOWOUT_FAILED}`, () => {
     props.recoveryMap.step =
       RECOVERY_MAP.ERROR_WHILE_RECOVERING.STEPS.DROP_TIP_BLOWOUT_FAILED
     render(props)
 
-    expect(screen.getByText('Blowout failed')).toBeInTheDocument()
+    expect(screen.queryAllByText('Blowout failed')[0]).toBeInTheDocument()
     expect(
-      screen.getByText(
+      screen.queryAllByText(
         'You can still drop the attached tips before proceeding to tip selection.'
-      )
+      )[0]
     ).toBeInTheDocument()
-    expect(screen.getByText('Continue to drop tip')).toBeInTheDocument()
+    expect(screen.queryAllByText('Continue to drop tip')[0]).toBeInTheDocument()
   })
 
   it(`renders RecoveryDropTipFlowErrors when step is ${ERROR_WHILE_RECOVERING.STEPS.DROP_TIP_TIP_DROP_FAILED}`, () => {
     props.recoveryMap.step =
       RECOVERY_MAP.ERROR_WHILE_RECOVERING.STEPS.DROP_TIP_TIP_DROP_FAILED
     render(props)
 
-    expect(screen.getByText('Tip drop failed')).toBeInTheDocument()
+    expect(screen.queryAllByText('Tip drop failed')[0]).toBeInTheDocument()
     expect(
-      screen.getByText(
+      screen.queryAllByText(
         'Next, you can try another recovery action or cancel the run.'
-      )
+      )[0]
     ).toBeInTheDocument()
-    expect(screen.getByText('Return to menu')).toBeInTheDocument()
+    expect(screen.queryAllByText('Return to menu')[0]).toBeInTheDocument()
   })
 
   it(`calls proceedToRouteAndStep with ${RECOVERY_MAP.OPTION_SELECTION.ROUTE} when the "Back to menu" button is clicked in ErrorRecoveryFlowError`, () => {
     props.recoveryMap.step =
       RECOVERY_MAP.ERROR_WHILE_RECOVERING.STEPS.RECOVERY_ACTION_FAILED
     render(props)
 
-    fireEvent.click(screen.getByText('Back to menu'))
+    fireEvent.click(screen.queryAllByText('Back to menu')[0])
 
     expect(proceedToRouteAndStepMock).toHaveBeenCalledWith(
       RECOVERY_MAP.OPTION_SELECTION.ROUTE
@@ -116,7 +117,7 @@ describe('RecoveryError', () => {
       RECOVERY_MAP.ERROR_WHILE_RECOVERING.STEPS.DROP_TIP_GENERAL_ERROR
     render(props)
 
-    fireEvent.click(screen.getByText('Return to menu'))
+    fireEvent.click(screen.queryAllByText('Return to menu')[0])
 
     expect(proceedToRouteAndStepMock).toHaveBeenCalledWith(
       RECOVERY_MAP.OPTION_SELECTION.ROUTE
@@ -128,7 +129,7 @@ describe('RecoveryError', () => {
       RECOVERY_MAP.ERROR_WHILE_RECOVERING.STEPS.DROP_TIP_TIP_DROP_FAILED
     render(props)
 
-    fireEvent.click(screen.getByText('Return to menu'))
+    fireEvent.click(screen.queryAllByText('Return to menu')[0])
 
     expect(proceedToRouteAndStepMock).toHaveBeenCalledWith(
       RECOVERY_MAP.OPTION_SELECTION.ROUTE
@@ -140,7 +141,7 @@ describe('RecoveryError', () => {
       RECOVERY_MAP.ERROR_WHILE_RECOVERING.STEPS.DROP_TIP_BLOWOUT_FAILED
     render(props)
 
-    fireEvent.click(screen.getByText('Continue to drop tip'))
+    fireEvent.click(screen.queryAllByText('Continue to drop tip')[0])
 
     expect(proceedToRouteAndStepMock).toHaveBeenCalledWith(
       RECOVERY_MAP.DROP_TIP_FLOWS.ROUTE,