make testing utils a first class directory

app/src/organisms/Alerts/__tests__/Alerts.test.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 import * as AppAlerts from '../../../redux/alerts'
 import { Alerts } from '..'
 import { LostConnectionAlert } from '../LostConnectionAlert'

app/src/organisms/CalibratePipetteOffset/__tests__/useCalibratePipetteOffset.test.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import uniqueId from 'lodash/uniqueId'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 import { act } from 'react-dom/test-utils'
 
 import * as RobotApi from '../../../redux/robot-api'

app/src/organisms/CalibrateTipLength/__tests__/AskForCalibrationBlockModal.test.tsx

@@ -1,12 +1,12 @@
 import * as React from 'react'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 import { act } from 'react-dom/test-utils'
 
 import { AskForCalibrationBlockModal } from '../AskForCalibrationBlockModal'
 import { CheckboxField } from '@opentrons/components'
 import { setUseTrashSurfaceForTipCal } from '../../../redux/calibration'
 
-import type { WrapperWithStore } from '@opentrons/components/__utils__'
+import type { WrapperWithStore } from '@opentrons/components'
 
 type RenderReturnType = WrapperWithStore<
   React.ComponentProps<typeof AskForCalibrationBlockModal>

app/src/organisms/CalibrationPanels/__tests__/ChooseTipRack.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 
 import { mockAttachedPipette } from '../../../redux/pipettes/__fixtures__'
 import { mockDeckCalTipRack } from '../../../redux/sessions/__fixtures__'
@@ -17,7 +17,7 @@ import { getAttachedPipettes } from '../../../redux/pipettes'
 import { ChooseTipRack } from '../ChooseTipRack'
 import type { AttachedPipettesByMount } from '../../../redux/pipettes/types'
 import type { ReactWrapper } from 'enzyme'
-import type { WrapperWithStore } from '@opentrons/components/__utils__'
+import type { WrapperWithStore } from '@opentrons/components'
 
 jest.mock('../../../redux/pipettes/selectors')
 jest.mock('../../../redux/calibration/')

app/src/organisms/ChangePipette/__tests__/ConfirmPipette.test.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 import {
   mountWithStore,
   WrapperWithStore,
-} from '@opentrons/components/__utils__'
+} from '@opentrons/components'
 
 import { ConfirmPipette } from '../ConfirmPipette'
 import { CheckPipettesButton } from '../CheckPipettesButton'

app/src/organisms/ProtocolModuleList/__tests__/ProtocolModuleList.test.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { StaticRouter } from 'react-router-dom'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../i18n'
 import { Box, Flex, ListItem, Tooltip } from '@opentrons/components'

app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/ExtraAttentionWarning.test.tsx

@@ -4,7 +4,7 @@ import { fireEvent, screen } from '@testing-library/react'
 import {
   partialComponentPropsMatcher,
   renderWithProviders,
-} from '@opentrons/components/__utils__'
+} from '@opentrons/components'
 import { i18n } from '../../../../../i18n'
 import { ExtraAttentionWarning } from '../ExtraAttentionWarning'
 import { SecureLabwareModal } from '../SecureLabwareModal'

app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/LabwareInfoOverlay.test.tsx

@@ -5,7 +5,7 @@ import {
   LabwareDefinition2,
 } from '@opentrons/shared-data'
 import fixture_tiprack_300_ul from '@opentrons/shared-data/labware/fixtures/2/fixture_tiprack_300_ul.json'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 import { i18n } from '../../../../../i18n'
 import { LabwareInfoOverlay } from '../LabwareInfoOverlay'
 

app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/LabwareSetup.test.tsx

@@ -15,7 +15,7 @@ import {
   renderWithProviders,
   componentPropsMatcher,
   partialComponentPropsMatcher,
-} from '@opentrons/components/__utils__'
+} from '@opentrons/components'
 import { i18n } from '../../../../../i18n'
 import { LabwareSetup } from '..'
 import { LabwareSetupModal } from '../LabwareSetupModal'

app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/LabwareSetupModal.test.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { fireEvent } from '@testing-library/react'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 import { i18n } from '../../../../../i18n'
 import { LabwareSetupModal } from '../LabwareSetupModal'
 

app/src/organisms/ProtocolSetup/RunSetupCard/ModuleSetup/__tests__/ModuleInfo.test.tsx

@@ -2,7 +2,7 @@ import React from 'react'
 import '@testing-library/jest-dom'
 import { ModuleModel, ModuleType } from '@opentrons/shared-data'
 import { ModuleInfo } from '../ModuleInfo'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 import { i18n } from '../../../../../i18n'
 
 const render = (props: React.ComponentProps<typeof ModuleInfo>) => {

app/src/organisms/ProtocolSetup/RunSetupCard/ModuleSetup/__tests__/ModuleSetup.test.tsx

@@ -8,7 +8,7 @@ import {
   renderWithProviders,
   partialComponentPropsMatcher,
   componentPropsMatcher,
-} from '@opentrons/components/__utils__'
+} from '@opentrons/components'
 import { i18n } from '../../../../../i18n'
 import { ModuleSetup } from '..'
 import { ModuleInfo } from '../ModuleInfo'

app/src/organisms/ProtocolSetup/RunSetupCard/ModuleSetup/__tests__/MultipleModuleModal.test.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { fireEvent } from '@testing-library/react'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 import { i18n } from '../../../../../i18n'
 import { MultipleModulesModal } from '../MultipleModulesModal'
 

app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/CalibrationItem.test.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import '@testing-library/jest-dom'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../../../i18n'
 import { CalibrationItem } from '../CalibrationItem'

app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/DeckCalibration.test.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react'
 import '@testing-library/jest-dom'
 import { fireEvent } from '@testing-library/react'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 import { mockDeckCalData } from '../../../../../redux/calibration/__fixtures__'
 import * as calibrationSelectors from '../../../../../redux/calibration/selectors'
 

app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/PipetteCalibration.test.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import '@testing-library/jest-dom'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 import { i18n } from '../../../../../i18n'
 import { mockProtocolPipetteTipRackCalInfo } from '../../../../../redux/pipettes/__fixtures__'
 import { PipetteCalibration } from '../PipetteCalibration'

app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/RobotCalibration.test.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react'
 import '@testing-library/jest-dom'
 import { fireEvent } from '@testing-library/react'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 import { i18n } from '../../../../../i18n'
 import * as PipetteOffset from '../../../../../redux/calibration/pipette-offset'
 import * as TipLength from '../../../../../redux/calibration/tip-length'

app/src/organisms/ProtocolSetup/RunSetupCard/__tests__/ProceedToRunCta.test.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react'
 import '@testing-library/jest-dom'
 import { StaticRouter } from 'react-router-dom'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 import { i18n } from '../../../../i18n'
 import * as hooks from '../hooks'
 import { ProceedToRunCta } from '../ProceedToRunCta'

app/src/organisms/ProtocolSetup/__tests__/CollapsibleStep.test.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import '@testing-library/jest-dom'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../i18n'
 import { CollapsibleStep } from '../RunSetupCard/CollapsibleStep'

app/src/organisms/ProtocolSetup/__tests__/MetadataCard.test.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import '@testing-library/jest-dom'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../i18n'
 import { MetadataCard } from '../MetadataCard'

app/src/organisms/ProtocolSetup/__tests__/RunSetupCard.test.tsx

@@ -6,7 +6,7 @@ import {
   componentPropsMatcher,
   partialComponentPropsMatcher,
   renderWithProviders,
-} from '@opentrons/components/__utils__'
+} from '@opentrons/components'
 import noModulesProtocol from '@opentrons/shared-data/protocol/fixtures/4/simpleV4.json'
 import withModulesProtocol from '@opentrons/shared-data/protocol/fixtures/4/testModulesProtocol.json'
 

app/src/organisms/ProtocolUpload/__tests__/ProtocolUpload.test.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react'
 import '@testing-library/jest-dom'
 import { fireEvent } from '@testing-library/react'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 import withModulesProtocol from '@opentrons/shared-data/protocol/fixtures/4/testModulesProtocol.json'
 
 import { i18n } from '../../../i18n'

app/src/organisms/ProtocolUpload/__tests__/UploadInput.test.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react'
 import '@testing-library/jest-dom'
 import { fireEvent } from '@testing-library/react'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../i18n'
 import { UploadInput } from '../UploadInput'

app/src/organisms/UpdateAppModal/__tests__/UpdateAppModal.test.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { Link as InternalLink } from 'react-router-dom'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 
 import { BaseModal, Flex, Icon } from '@opentrons/components'
 import * as Shell from '../../../redux/shell'

app/src/pages/Calibrate/CalibratePanel/__tests__/CalibrationData.test.tsx

@@ -1,10 +1,10 @@
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../../i18n'
 import { CalibrationData } from '../CalibrationData'
 
-import type { WrapperWithStore } from '@opentrons/components/__utils__'
+import type { WrapperWithStore } from '@opentrons/components'
 
 describe('CalibrationData', () => {
   let render: (

app/src/pages/Calibrate/CalibratePanel/__tests__/LabwareGroup.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../../i18n'
 import wellPlate96Def from '@opentrons/shared-data/labware/fixtures/2/fixture_96_plate.json'

app/src/pages/Calibrate/CalibratePanel/__tests__/PipetteList.test.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { StaticRouter } from 'react-router-dom'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../../i18n'
 import * as PipettesSelectors from '../../../../redux/pipettes/selectors'

app/src/pages/Calibrate/CalibratePanel/__tests__/TipLengthCalibrationData.test.tsx

@@ -1,10 +1,10 @@
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../../i18n'
 import { TipLengthCalibrationData } from '../TipLengthCalibrationData'
 
-import type { WrapperWithStore } from '@opentrons/components/__utils__'
+import type { WrapperWithStore } from '@opentrons/components'
 
 describe('TipLengthCalibrationData', () => {
   let render: (

app/src/pages/Calibrate/__tests__/CalibrateTipLengthControl.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 
 import wellPlate96Def from '@opentrons/shared-data/labware/fixtures/2/fixture_96_plate.json'
 import tiprack300Def from '@opentrons/shared-data/labware/fixtures/2/fixture_tiprack_300_ul.json'
@@ -16,7 +16,7 @@ import * as Analytics from '../../../redux/analytics/actions'
 import type { Labware } from '../../../redux/robot/types'
 import type { State } from '../../../redux/types'
 import type { DispatchApiRequestType } from '../../../redux/robot-api'
-import type { WrapperWithStore } from '@opentrons/components/__utils__'
+import type { WrapperWithStore } from '@opentrons/components'
 
 jest.mock('../../../redux/robot-api')
 jest.mock('../../../redux/robot/selectors')

app/src/pages/More/AddLabwareCard/__tests__/AddLabwareCard.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 
 import * as CustomLabware from '../../../../redux/custom-labware'
 import * as CustomLabwareFixtures from '../../../../redux/custom-labware/__fixtures__'
@@ -8,7 +8,7 @@ import { ManagePath } from '../ManagePath'
 import { AddLabware } from '../AddLabware'
 import { AddLabwareFailureModal } from '../AddLabwareFailureModal'
 
-import type { WrapperWithStore } from '@opentrons/components/__utils__'
+import type { WrapperWithStore } from '@opentrons/components'
 import type { State, Action } from '../../../../redux/types'
 
 jest.mock('../../../../redux/custom-labware/selectors')

app/src/pages/More/AppSettings/__tests__/AppAdvancedSettingsCard.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 import * as Config from '../../../../redux/config'
 import { AppAdvancedSettingsCard } from '../AppAdvancedSettingsCard'
 

app/src/pages/More/AppSettings/__tests__/AppSoftwareSettingsCard.test.tsx

@@ -1,7 +1,7 @@
 // tests for the AppSoftwareSettingsCard
 import * as React from 'react'
 
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 import { Card, LabeledValue, Link, SecondaryBtn } from '@opentrons/components'
 import * as Shell from '../../../../redux/shell'
 import { Portal } from '../../../../App/portal'

app/src/pages/More/AppSettings/__tests__/UpdateNotificationsControl.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 
 import { BORDER_SOLID_LIGHT } from '@opentrons/components'
 import * as Alerts from '../../../../redux/alerts'

app/src/pages/Robots/InstrumentSettings/__tests__/PipetteInfo.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 
 import * as Config from '../../../../redux/config'
 import {

app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/UpdateBuildroot.test.tsx

@@ -3,7 +3,7 @@ import * as React from 'react'
 import {
   mountWithStore,
   WrapperWithStore,
-} from '@opentrons/components/__utils__'
+} from '@opentrons/components'
 import { mockConnectableRobot as mockRobot } from '../../../../../redux/discovery/__fixtures__'
 import * as Buildroot from '../../../../../redux/buildroot'
 import { UpdateBuildroot } from '..'

app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/VersionInfoModal.test.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 import { AlertModal, OutlineButton } from '@opentrons/components'
 import { mockReachableRobot } from '../../../../../redux/discovery/__fixtures__'
 import { UPGRADE, DOWNGRADE, REINSTALL } from '../../../../../redux/buildroot'

app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/ViewUpdateModal.test.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 import * as Buildroot from '../../../../../redux/buildroot'
 
 import { DownloadUpdateModal } from '../DownloadUpdateModal'

app/src/pages/Robots/RobotSettings/__tests__/AdvancedSettingsCard.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../../i18n'
 

app/src/pages/Robots/RobotSettings/__tests__/CalibrationCard.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 import { saveAs } from 'file-saver'
 
 import { i18n } from '../../../../i18n'

app/src/pages/Robots/RobotSettings/__tests__/CheckCalibrationControl.test.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 import {
   mountWithProviders,
   WrapperWithStore,
-} from '@opentrons/components/__utils__'
+} from '@opentrons/components'
 
 import { i18n } from '../../../../i18n'
 import * as Sessions from '../../../../redux/sessions'

app/src/pages/Robots/RobotSettings/__tests__/ConnectionCard.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 import { i18n } from '../../../../i18n'
 
 import * as Networking from '../../../../redux/networking'

app/src/pages/Robots/RobotSettings/__tests__/ControlsCard.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../../i18n'
 import * as RobotControls from '../../../../redux/robot-controls'

app/src/pages/Robots/RobotSettings/__tests__/DeckCalibrationControl.test.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 import {
   mountWithProviders,
   WrapperWithStore,
-} from '@opentrons/components/__utils__'
+} from '@opentrons/components'
 
 import { i18n } from '../../../../i18n'