add test and fix robotname functionality

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

@@ -0,0 +1,149 @@
+import React from 'react'
+import '@testing-library/jest-dom'
+import { StaticRouter } from 'react-router-dom'
+import { ModuleModel, ModuleRealType } from '@opentrons/shared-data'
+import { renderWithProviders } from '@opentrons/components/__utils__'
+import { i18n } from '../../../../../i18n'
+import { ModuleInfo } from '../ModuleInfo'
+import { when } from 'jest-when'
+
+jest.mock('../ModuleInfo')
+
+const componentPropsMatcher = (matcher: unknown) =>
+ // @ts-expect-error(sa, 2021-08-03): when.allArgs not part of type definition yet for jest-when
+ when.allArgs((args, equals) => equals(args[0], matcher))
+
+const render = (props: React.ComponentProps<typeof ModuleInfo>) => {
+ return renderWithProviders(
+ <StaticRouter>
+ <ModuleInfo {...props} />
+ </StaticRouter>,
+ {
+ i18nInstance: i18n,
+ }
+ )
+}
+const mockModuleInfo = ModuleInfo as jest.MockedFunction<typeof ModuleInfo>
+const MOCK_IS_ATTACHED = false || true
+const MOCK_TC_COORDS = [20, 30, 0]
+
+const STUBBED_ORIENTATION_VALUE = 'left'
+const mockTCModule = {
+ labwareOffset: { x: 3, y: 3, z: 3 },
+ moduleId: 'TCModuleId',
+ model: 'thermocyclerModuleV1' as ModuleModel,
+ type: 'thermocyclerModuleType' as ModuleRealType,
+}
+
+describe('ModuleInfo', () => {
+ let props: React.ComponentProps<typeof ModuleInfo>
+ beforeEach(() => {
+ props = {
+ x: 3,
+ y: 3,
+ orientation: 'left',
+ moduleModel: mockTCModule.model,
+ usbPort: '',
+ hubPort: '',
+ isAttached: MOCK_IS_ATTACHED,
+ }
+ })
+
+ it('should render no modules connected', () => {
+ const usbPort = null
+ const hubPort = null
+ const isAttached = false
+ props = {
+ ...props,
+ usbPort,
+ hubPort,
+ isAttached,
+ }
+
+ when(mockModuleInfo)
+ .calledWith(
+ componentPropsMatcher({
+ orientation: STUBBED_ORIENTATION_VALUE,
+ moduleModel: mockTCModule.model,
+ x: MOCK_TC_COORDS[0],
+ y: MOCK_TC_COORDS[1],
+ isAttached: true,
+ usbPort: null,
+ hubPort: null,
+ })
+ )
+ .mockReturnValue(<div>mock module info {mockTCModule.model} </div>)
+
+ props = {
+ ...props,
+ usbPort,
+ hubPort,
+ isAttached,
+ }
+ })
+
+ it('should render modules connected on a robot server 4.3 or higher', () => {
+ const usbPort = '1'
+ const hubPort = '1'
+ const isAttached = true
+ props = {
+ ...props,
+ usbPort,
+ hubPort,
+ isAttached,
+ }
+
+ when(mockModuleInfo)
+ .calledWith(
+ componentPropsMatcher({
+ orientation: STUBBED_ORIENTATION_VALUE,
+ moduleModel: mockTCModule.model,
+ x: MOCK_TC_COORDS[0],
+ y: MOCK_TC_COORDS[1],
+ isAttached: true,
+ usbPort: '1',
+ hubPort: '1',
+ })
+ )
+ .mockReturnValue(<div>mock module info {mockTCModule.model} </div>)
+
+ props = {
+ ...props,
+ usbPort,
+ hubPort,
+ isAttached,
+ }
+ })
+ it('should render modules connected on a robot server lower than 4.3', () => {
+ const usbPort = null
+ const hubPort = null
+ const isAttached = true
+ props = {
+ ...props,
+ usbPort,
+ hubPort,
+ isAttached,
+ }
+
+ when(mockModuleInfo)
+ .calledWith(
+ componentPropsMatcher({
+ orientation: STUBBED_ORIENTATION_VALUE,
+ moduleModel: mockTCModule.model,
+ x: MOCK_TC_COORDS[0],
+ y: MOCK_TC_COORDS[1],
+ isAttached: true,
+ usbPort: null,
+ hubPort: null,
+ })
+ )
+ .mockReturnValue(<div>mock module info {mockTCModule.model} </div>)
+
+ props = {
+ ...props,
+ usbPort,
+ hubPort,
+ isAttached,
+ }
+ })
+})

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

@@ -68,6 +68,7 @@ const render = (props: React.ComponentProps<typeof ModuleSetup>) => {
 const STUBBED_ORIENTATION_VALUE = 'left'
 const MOCK_MAGNETIC_MODULE_COORDS = [10, 20, 0]
 const MOCK_TC_COORDS = [20, 30, 0]
+const MOCK_ROBOT_NAME = 'ot-dev'
 
 const mockMagneticModule = {
  labwareOffset: { x: 5, y: 5, z: 5 },
@@ -87,7 +88,7 @@ describe('ModuleSetup', () => {
  let props: React.ComponentProps<typeof ModuleSetup>
  beforeEach(() => {
  props = {
- robotName: 'opentrons-dev',
+ robotName: MOCK_ROBOT_NAME,
  moduleRenderCoords: {},
  expandLabwareSetupStep: () => {},
  }
@@ -114,7 +115,7 @@ describe('ModuleSetup', () => {
  </div>
  ))
  when(mockGetAttachedModules)
- .calledWith(undefined as any, 'opentrons-dev')
+ .calledWith(undefined as any, MOCK_ROBOT_NAME)
  .mockReturnValue([])
  })
 
@@ -230,7 +231,7 @@ describe('ModuleSetup', () => {
  },
  }
  when(mockGetAttachedModules)
- .calledWith(undefined as any, 'opentrons-dev')
+ .calledWith(undefined as any, MOCK_ROBOT_NAME)
  .mockReturnValue([
  {
  ...mockMagneticModuleFixture,

app/src/organisms/ProtocolSetup/RunSetupCard/index.tsx

@@ -80,7 +80,7 @@ export function RunSetupCard(): JSX.Element | null {
  <ModuleSetup
  moduleRenderCoords={moduleRenderCoords}
  expandLabwareSetupStep={() => setExpandedStepKey(LABWARE_SETUP_KEY)}
- robotName={'opentrons-dev'} // TODO: immediately import robot name
+ robotName={robot.name}
  />
  ),
  [LABWARE_SETUP_KEY]: (

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

@@ -128,7 +128,7 @@ describe('RunSetupCard', () => {
  componentPropsMatcher({
  moduleRenderCoords: mockModuleRenderCoords,
  expandLabwareSetupStep: expect.anything(),
- robotName: 'opentrons-dev', // replace this with a mocked robot name
+ robotName: mockConnectedRobot.name,
  })
  )
  .mockImplementation(({ expandLabwareSetupStep }) => (