Skip to content

Commit

Permalink
address comments
Browse files Browse the repository at this point in the history
  • Loading branch information
jerader committed Jul 18, 2024
1 parent 6349e40 commit c2d1f58
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ import { ExitModal } from '../ExitModal'
import { ConfirmPipette } from '../ConfirmPipette'
import { ChangePipette } from '..'

import type { useNavigate } from 'react-router-dom'
import type { NavigateFunction } from 'react-router-dom'
import type { PipetteNameSpecs } from '@opentrons/shared-data'
import type { AttachedPipette } from '../../../redux/pipettes/types'
import type { DispatchApiRequestType } from '../../../redux/robot-api'

const mockNavigate = vi.fn()

vi.mock('react-router-dom', async importOriginal => {
const actual = await importOriginal<typeof useNavigate>()
const actual = await importOriginal<typeof NavigateFunction>()
return {
...actual,
useNavigate: () => mockNavigate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import { describe, it, beforeEach, vi, expect } from 'vitest'
import { renderWithProviders } from '../../../__testing-utils__'
import { i18n } from '../../../i18n'
import { DeckConfigurationDiscardChangesModal } from '../DeckConfigurationDiscardChangesModal'
import type { useNavigate } from 'react-router-dom'
import type { NavigateFunction } from 'react-router-dom'

const mockFunc = vi.fn()
const mockNavigate = vi.fn()

vi.mock('react-router-dom', async importOriginal => {
const actual = await importOriginal<typeof useNavigate>()
const actual = await importOriginal<typeof NavigateFunction>()
return {
...actual,
useNavigate: () => mockNavigate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import { renderWithProviders } from '../../../__testing-utils__'
import { i18n } from '../../../i18n'
import { AlternativeSecurityTypeModal } from '../AlternativeSecurityTypeModal'

import type { useNavigate } from 'react-router-dom'
import type { NavigateFunction } from 'react-router-dom'

const mockFunc = vi.fn()
const mockNavigate = vi.fn()
vi.mock('react-router-dom', async importOriginal => {
const actual = await importOriginal<typeof useNavigate>()
const actual = await importOriginal<typeof NavigateFunction>()
return {
...actual,
useNavigate: () => mockNavigate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import * as Fixtures from '../../../redux/networking/__fixtures__'
import { DisplaySearchNetwork } from '../DisplaySearchNetwork'
import { DisplayWifiList } from '../DisplayWifiList'

import type { useNavigate } from 'react-router-dom'
import type { NavigateFunction } from 'react-router-dom'

const mockNavigate = vi.fn()
const mockWifiList = [
Expand All @@ -24,7 +24,7 @@ vi.mock('../../../redux/networking/selectors')
vi.mock('../../../redux/discovery/selectors')
vi.mock('../DisplaySearchNetwork')
vi.mock('react-router-dom', async importOriginal => {
const actual = await importOriginal<typeof useNavigate>()
const actual = await importOriginal<typeof NavigateFunction>()
return {
...actual,
useNavigate: () => mockNavigate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { AlternativeSecurityTypeModal } from '../AlternativeSecurityTypeModal'
import { SelectAuthenticationType } from '../SelectAuthenticationType'
import { SetWifiCred } from '../SetWifiCred'

import type { useNavigate } from 'react-router-dom'
import type { NavigateFunction } from 'react-router-dom'

const mockNavigate = vi.fn()
const mockSetSelectedAuthType = vi.fn()
Expand All @@ -22,7 +22,7 @@ vi.mock('../../../redux/discovery/selectors')
vi.mock('../AlternativeSecurityTypeModal')
vi.mock('../../RobotSettingsDashboard/NetworkSettings/hooks')
vi.mock('react-router-dom', async importOriginal => {
const actual = await importOriginal<typeof useNavigate>()
const actual = await importOriginal<typeof NavigateFunction>()
return {
...actual,
useNavigate: () => mockNavigate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import * as Fixtures from '../../../redux/networking/__fixtures__'
import { NetworkDetailsModal } from '../../RobotSettingsDashboard/NetworkSettings/NetworkDetailsModal'
import { WifiConnectionDetails } from '../WifiConnectionDetails'

import type { useNavigate } from 'react-router-dom'
import type { NavigateFunction } from 'react-router-dom'

vi.mock('../../../resources/networking/hooks')
vi.mock('../../../redux/networking')
Expand All @@ -20,7 +20,7 @@ vi.mock('../../RobotSettingsDashboard/NetworkSettings/NetworkDetailsModal')

const mockNavigate = vi.fn()
vi.mock('react-router-dom', async importOriginal => {
const actual = await importOriginal<typeof useNavigate>()
const actual = await importOriginal<typeof NavigateFunction>()
return {
...actual,
useNavigate: () => mockNavigate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import { renderWithProviders } from '../../../../__testing-utils__'
import { i18n } from '../../../../i18n'
import { ConfirmRobotName } from '../ConfirmRobotName'

import type { useNavigate } from 'react-router-dom'
import type { NavigateFunction } from 'react-router-dom'

const mockNavigate = vi.fn()

vi.mock('react-router-dom', async importOriginal => {
const actual = await importOriginal<typeof useNavigate>()
const actual = await importOriginal<typeof NavigateFunction>()
return {
...actual,
useNavigate: () => mockNavigate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ import {
INIT_STATUS,
} from '../../../../resources/health/hooks'

import type { useNavigate } from 'react-router-dom'
import type { NavigateFunction } from 'react-router-dom'
import type { ProtocolHardware } from '../../../../pages/Protocols/hooks'

const mockNavigate = vi.fn()

vi.mock('react-router-dom', async importOriginal => {
const actual = await importOriginal<typeof useNavigate>()
const actual = await importOriginal<typeof NavigateFunction>()
return {
...actual,
useNavigate: () => mockNavigate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { mockConnectedRobot } from '../../../../redux/discovery/__fixtures__'
import { ConfirmCancelRunModal } from '../ConfirmCancelRunModal'
import { CancelingRunModal } from '../CancelingRunModal'

import type { useNavigate } from 'react-router-dom'
import type { NavigateFunction } from 'react-router-dom'

vi.mock('@opentrons/react-api-client')
vi.mock('../../../../organisms/Devices/hooks')
Expand All @@ -38,7 +38,7 @@ const mockTrackProtocolRunEvent = vi.fn(
)

vi.mock('react-router-dom', async importOriginal => {
const actual = await importOriginal<typeof useNavigate>()
const actual = await importOriginal<typeof NavigateFunction>()
return {
...actual,
useNavigate: () => mockNavigate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { renderWithProviders } from '../../../../__testing-utils__'
import { i18n } from '../../../../i18n'
import { RunFailedModal } from '../RunFailedModal'

import type { useNavigate } from 'react-router-dom'
import type { NavigateFunction } from 'react-router-dom'

vi.mock('@opentrons/react-api-client')

Expand Down Expand Up @@ -74,7 +74,7 @@ const mockErrors = [
const mockStopRun = vi.fn((_runId, opts) => opts.onSuccess())

vi.mock('react-router-dom', async importOriginal => {
const actual = await importOriginal<typeof useNavigate>()
const actual = await importOriginal<typeof NavigateFunction>()
return {
...actual,
useNavigate: () => mockNavigate,
Expand Down

0 comments on commit c2d1f58

Please sign in to comment.