Skip to content

Commit ec54caf

Browse files
sanni-tjerader
andauthored
fix(shared-data): update lc display names (#18711)
Closes AUTH-2003 # Overview Updates the display names to correct ones shown in design proposals. ## Risk assessment None. --------- Co-authored-by: Jethary <[email protected]>
1 parent 684bd6a commit ec54caf

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

api/tests/opentrons/protocol_api_integration/test_liquid_classes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def test_liquid_class_creation_and_property_fetching(
2323
water = simulated_protocol_context.get_liquid_class("water")
2424

2525
assert water.name == "water"
26-
assert water.display_name == "Aqueous"
26+
assert water.display_name == "Aqueous (Deionized water)"
2727

2828
# TODO (spp, 2024-10-17): update this to fetch pipette load name from instrument context
2929
assert (

protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/MoveLiquidTools/__tests__/LiquidClassesStepTools.test.tsx

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import { describe, it, vi, beforeEach, expect } from 'vitest'
21
import { fireEvent, screen } from '@testing-library/react'
3-
import { i18n } from '../../../../../../../assets/localization'
2+
import { beforeEach, describe, expect, it, vi } from 'vitest'
43
import { renderWithProviders } from '../../../../../../../__testing-utils__'
4+
import { i18n } from '../../../../../../../assets/localization'
55
import { getLiquidEntities } from '../../../../../../../step-forms/selectors'
66
import { LiquidClassesStepTools } from '../LiquidClassesStepTools'
7-
87
import type { ComponentProps } from 'react'
98

109
vi.mock('../../../../../../../step-forms/selectors')
@@ -39,15 +38,17 @@ describe('LiquidClassesStepMoveLiquidTools', () => {
3938
render(props)
4039
screen.getByText('Apply liquid class settings for this transfer')
4140
screen.getByText("Don't use a liquid class")
42-
screen.getByText('Aqueous')
41+
screen.getByText('Aqueous (Deionized water)')
4342
screen.getByText('Deionized water')
44-
screen.getByText('Viscous')
43+
screen.getByText('Viscous (50% glycerol)')
4544
screen.getByText('50% glycerol')
46-
screen.getByText('Volatile')
45+
screen.getByText('Volatile (80% ethanol)')
4746
screen.getByText('80% ethanol')
4847

4948
fireEvent.click(
50-
screen.getByRole('label', { name: 'Aqueous Deionized water' })
49+
screen.getByRole('label', {
50+
name: 'Aqueous (Deionized water) Deionized water',
51+
})
5152
)
5253
expect(props.propsForFields.liquidClass.updateValue).toHaveBeenCalled()
5354
})

shared-data/liquid-class/definitions/1/ethanol_80/1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"liquidClassName": "ethanol_80",
3-
"displayName": "Volatile",
3+
"displayName": "Volatile (80% ethanol)",
44
"description": "80% ethanol",
55
"schemaVersion": 1,
66
"version": 1,

shared-data/liquid-class/definitions/1/glycerol_50/1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"liquidClassName": "glycerol_50",
3-
"displayName": "Viscous",
3+
"displayName": "Viscous (50% glycerol)",
44
"description": "50% glycerol",
55
"schemaVersion": 1,
66
"version": 1,

shared-data/liquid-class/definitions/1/water/1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"liquidClassName": "water",
3-
"displayName": "Aqueous",
3+
"displayName": "Aqueous (Deionized water)",
44
"description": "Deionized water",
55
"schemaVersion": 1,
66
"version": 1,

0 commit comments

Comments
 (0)