Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(app): extend SectionList component for Generic Step Screen #8513

Merged
merged 12 commits into from
Oct 13, 2021
Merged

feat(app): extend SectionList component for Generic Step Screen #8513

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2698e2f
add section props to generic step screen
jerader Oct 11, 2021
d719074
create positionchecknav test
jerader Oct 12, 2021
9ef3247
feat(app): extend PositionCheckNav component for Generic Step Screen
jerader Oct 12, 2021
71c2404
increase test coverage
jerader Oct 12, 2021
ed03c83
clean up file
jerader Oct 12, 2021
3261c8a
add compeltedSections prop value
jerader Oct 13, 2021
870023b
remove extra spaces
jerader Oct 13, 2021
8e4e4b7
fix genericStepScreen styling
jerader Oct 13, 2021
4ebbb0c
revert export function change back to export const
jerader Oct 13, 2021
a28ca07
rename PositionCheckNav to SectionList
jerader Oct 13, 2021
2da5499
fix jest test
jerader Oct 13, 2021
5c8c579
address pr changes
jerader Oct 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
increase test coverage
  • Loading branch information
@jerader
jerader committed Oct 12, 2021
commit 71c24048b3b4a89acd2d59cca1edf79d254ab640
43 changes: 29 additions & 14 deletions app/src/organisms/ProtocolSetup/LabwarePositionCheck/__tests__/PositionCheckNav.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ const MOCK_SECTIONS_2_PIPETTES_3_STEPS = [
'RETURN_TIP',
] as Section[]
const MOCK_SECTIONS_2_PIPETTES_4_STEPS = [
'PRIMARY_PIPETTE_TIPRACKS',
'SECONDARY_PIPETTE_TIPRACKS',
'CHECK_REMAINING_LABWARE_WITH_PRIMARY_PIPETTE',
'RETURN_TIP',
] as Section[]
'PRIMARY_PIPETTE_TIPRACKS',
'SECONDARY_PIPETTE_TIPRACKS',
'CHECK_REMAINING_LABWARE_WITH_PRIMARY_PIPETTE',
'RETURN_TIP',
] as Section[]

const render = (props: React.ComponentProps<typeof PositionCheckNav>) => {
return renderWithProviders(<PositionCheckNav {...props} />, {
Expand All @@ -39,9 +39,9 @@ describe('PositionCheckNav', () => {
})
it('renders a 2 step Nav with 1 pipette', () => {
const { getByText } = render(props)
expect(getByText('1')).toBeTruthy()
expect(getByText('1')).toHaveStyle('backgroundColor: #00c3e6')
expect(getByText('Check tipracks with Left Pipette')).toBeTruthy()
expect(getByText('2')).toBeTruthy()
expect(getByText('2')).toHaveStyle('backgroundColor: C_DISABLED')
expect(getByText('Return tip')).toBeTruthy()
})
it('renders a 3 step Nav with 2 pipettes', () => {
Expand All @@ -52,11 +52,11 @@ describe('PositionCheckNav', () => {
secondaryPipetteMount: 'right',
}
const { getByText } = render(props)
expect(getByText('1')).toBeTruthy()
expect(getByText('1')).toHaveStyle('backgroundColor: #00c3e6')
expect(getByText('Check tipracks with Left Pipette')).toBeTruthy()
expect(getByText('2')).toBeTruthy()
expect(getByText('2')).toHaveStyle('backgroundColor: C_DISABLED')
expect(getByText('Check tipracks with Right Pipette')).toBeTruthy()
expect(getByText('3')).toBeTruthy()
expect(getByText('3')).toHaveStyle('backgroundColor: C_DISABLED')
expect(getByText('Return tip')).toBeTruthy()
})
it('renders a 4 step Nav with 2 pipettes', () => {
Expand All @@ -67,13 +67,28 @@ describe('PositionCheckNav', () => {
secondaryPipetteMount: 'right',
}
const { getByText } = render(props)
expect(getByText('1')).toBeTruthy()
expect(getByText('1')).toHaveStyle('backgroundColor: #00c3e6')
expect(getByText('Check tipracks with Left Pipette')).toBeTruthy()
expect(getByText('2')).toBeTruthy()
expect(getByText('2')).toHaveStyle('backgroundColor: C_DISABLED')
expect(getByText('Check tipracks with Right Pipette')).toBeTruthy()
expect(getByText('3')).toBeTruthy()
expect(getByText('3')).toHaveStyle('backgroundColor: C_DISABLED')
expect(getByText('Check remaining labware with Left Pipette')).toBeTruthy()
expect(getByText('4')).toBeTruthy()
expect(getByText('4')).toHaveStyle('backgroundColor: C_DISABLED')
expect(getByText('Return tip')).toBeTruthy()
})
it('renders a 3 step Nav with 2 pipettes and on the second step', () => {
props = {
sections: MOCK_SECTIONS_2_PIPETTES_3_STEPS,
currentSection: 'SECONDARY_PIPETTE_TIPRACKS',
primaryPipetteMount: 'left',
secondaryPipetteMount: 'right',
completedSections: ['PRIMARY_PIPETTE_TIPRACKS'],
}
const { getByText } = render(props)
expect(getByText('Check tipracks with Left Pipette')).toBeTruthy()
expect(getByText('2')).toHaveStyle('backgroundColor: #00c3e6')
expect(getByText('Check tipracks with Right Pipette')).toBeTruthy()
expect(getByText('3')).toHaveStyle('backgroundColor: C_DISABLED')
expect(getByText('Return tip')).toBeTruthy()
})
})