Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
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
2 changes: 1 addition & 1 deletion app/src/atoms/Link/__tests__/ExternalLink.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ describe('ExternalLink', () => {
const link = screen.getByText('Test Link')
expect(link).toHaveAttribute('href', 'https://opentrons.com')
expect(link).toHaveAttribute('target', '_blank')
expect(link).toHaveStyle(`color: ${COLORS.blue55}`)
expect(link).toHaveStyle(`color: ${COLORS.blue50}`)
})

it('renders open-in-new icon', () => {
Expand Down
42 changes: 1 addition & 41 deletions app/src/atoms/MenuList/__tests__/OverflowBtn.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,47 +28,7 @@ describe('OverflowBtn', () => {
})

expect(getByRole('button')).toHaveStyle(
`background-color: ${COLORS.grey35}`
)
})

it('renders an active state', () => {
const { getByRole } = render({
onClick: vi.fn(),
})

expect(getByRole('button')).toHaveStyle(
`background-color: ${String(COLORS.grey35)}`
)
})

it.skip('renders a focus state', () => {
const { getByRole } = render({
onClick: vi.fn(),
})

// @ts-expect-error Refactor to test modifier states.
expect(getByRole('button')).toHaveStyleRule(
'box-shadow',
`0 0 0 3px ${String(COLORS.yellow50)}`,
{
modifier: ':focus-visible',
}
)
})

it.skip('renders a disabled state', () => {
const { getByRole } = render({
onClick: vi.fn(),
})

// @ts-expect-error Refactor to test modifier states.
expect(getByRole('button')).toHaveStyleRule(
'fill',
`${String(COLORS.grey40)}`,
{
modifier: ':disabled circle',
}
`background-color: ${COLORS.transparent}`
)
})
})
13 changes: 2 additions & 11 deletions app/src/atoms/buttons/__tests__/FloatingActionButton.test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react'
import { describe, it, expect, vi, beforeEach } from 'vitest'
import '@testing-library/jest-dom/vitest'
import { fireEvent, screen } from '@testing-library/react'
import { screen } from '@testing-library/react'
import { BORDERS, COLORS, SPACING, TYPOGRAPHY } from '@opentrons/components'

import { i18n } from '../../../i18n'
Expand Down Expand Up @@ -30,7 +30,7 @@ describe('FloatingActionButton', () => {
expect(button).toHaveStyle(
`padding: ${SPACING.spacing12} ${SPACING.spacing24}`
)
expect(button).toHaveStyle(`background-color: ${COLORS.purple55}`)
expect(button).toHaveStyle(`background-color: ${COLORS.purple50}`)
expect(button).toHaveStyle(`font-size: ${TYPOGRAPHY.fontSize28}`)
expect(button).toHaveStyle(`font-weight: ${TYPOGRAPHY.fontWeightSemiBold}`)
expect(button).toHaveStyle(`line-height: ${TYPOGRAPHY.lineHeight36}`)
Expand All @@ -47,14 +47,5 @@ describe('FloatingActionButton', () => {
render(props)
const button = screen.getByRole('button')
expect(button).toBeDisabled()
expect(button).toHaveStyle(`background-color: ${COLORS.grey35}`)
expect(button).toHaveStyle(`color: ${COLORS.grey50}`)
})

it('applies the correct states to the unselected floating action button - active', () => {
render(props)
const button = screen.getByRole('button')
fireEvent.mouseLeave(button)
expect(button).toHaveStyle(`background-color : ${COLORS.purple55}`)
})
})
7 changes: 2 additions & 5 deletions app/src/atoms/buttons/__tests__/LargeButton.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ describe('LargeButton', () => {
render(props)
fireEvent.click(screen.getByText('large button'))
expect(props.onClick).toHaveBeenCalled()
expect(screen.getByRole('button')).toHaveStyle(
`background-color: ${COLORS.blue60}`
)
})
it('renders the alert button', () => {
props = {
Expand All @@ -35,7 +32,7 @@ describe('LargeButton', () => {
}
render(props)
expect(screen.getByRole('button')).toHaveStyle(
`background-color: ${COLORS.red40}`
`background-color: ${COLORS.red35}`
)
})
it('renders the secondary button', () => {
Expand All @@ -45,7 +42,7 @@ describe('LargeButton', () => {
}
render(props)
expect(screen.getByRole('button')).toHaveStyle(
`background-color: ${COLORS.blue40}`
`background-color: ${COLORS.blue35}`
)
})
it('renders the button as disabled', () => {
Expand Down
17 changes: 11 additions & 6 deletions app/src/atoms/buttons/__tests__/MediumButton.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,31 +24,36 @@ describe('MediumButton', () => {
render(props)
fireEvent.click(screen.getByText('Medium button'))
expect(props.onClick).toHaveBeenCalled()
expect(screen.getByRole('button')).toHaveStyle('background-color: #045dd0')
})
it('renders the alert button', () => {
props = {
...props,
buttonType: 'alert',
}
render(props)
expect(screen.getByRole('button')).toHaveStyle('background-color: #b91f20')
expect(screen.getByRole('button')).toHaveStyle(
`background-color: ${COLORS.red50}`
)
})
it('renders the secondary button', () => {
props = {
...props,
buttonType: 'secondary',
}
render(props)
expect(screen.getByRole('button')).toHaveStyle('background-color: #94afd4')
expect(screen.getByRole('button')).toHaveStyle(
`background-color: ${COLORS.blue35}`
)
})
it('renders the secondary alert button', () => {
props = {
...props,
buttonType: 'alertSecondary',
}
render(props)
expect(screen.getByRole('button')).toHaveStyle('background-color: #ccabac')
expect(screen.getByRole('button')).toHaveStyle(
`background-color: ${COLORS.red35}`
)
})
it('renders the tertiary high button', () => {
props = {
Expand All @@ -57,7 +62,7 @@ describe('MediumButton', () => {
}
render(props)
expect(screen.getByRole('button')).toHaveStyle(
`background-color: ${COLORS.grey35}`
`background-color: ${COLORS.white}`
)
})
it('renders the tertiary low light button', () => {
Expand All @@ -67,7 +72,7 @@ describe('MediumButton', () => {
}
render(props)
expect(screen.getByRole('button')).toHaveStyle(
`background-color: ${COLORS.grey35}`
`background-color: ${COLORS.white}`
)
})
it('renders the button as disabled', () => {
Expand Down
21 changes: 10 additions & 11 deletions app/src/atoms/buttons/__tests__/QuaternaryButton.test.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
import * as React from 'react'
import '@testing-library/jest-dom/vitest'
import { describe, it, expect, beforeEach } from 'vitest'
import { screen, fireEvent } from '@testing-library/react'
import { describe, it, expect, beforeEach, vi } from 'vitest'
import { screen } from '@testing-library/react'
import { COLORS, SPACING, TYPOGRAPHY, BORDERS } from '@opentrons/components'
import { renderWithProviders } from '../../../__testing-utils__'

import { QuaternaryButton } from '..'

vi.mock('styled-components', async () => {
const actual = await vi.importActual(
'styled-components/dist/styled-components.browser.esm.js'
)
return actual
})

const render = (props: React.ComponentProps<typeof QuaternaryButton>) => {
return renderWithProviders(<QuaternaryButton {...props} />)[0]
}
Expand All @@ -25,7 +32,7 @@ describe('QuaternaryButton', () => {
const button = screen.getByText('secondary tertiary button')
expect(button).toHaveStyle(`background-color: ${COLORS.white}`)
expect(button).toHaveStyle(`border-radius: ${BORDERS.borderRadiusFull}`)
expect(button).toHaveStyle('box-shadow: 0 0 0')
expect(button).toHaveStyle('box-shadow: none')
expect(button).toHaveStyle(`color: ${COLORS.blue50}`)
expect(button).toHaveStyle(
`padding: ${SPACING.spacing8} ${SPACING.spacing16} ${SPACING.spacing8} ${SPACING.spacing16}`
Expand All @@ -47,14 +54,6 @@ describe('QuaternaryButton', () => {
expect(button).toHaveStyle('opacity: 50%')
})

it('applies the correct states to the button - hover', () => {
render(props)
const button = screen.getByText('secondary tertiary button')
fireEvent.mouseOver(button)
expect(button).toHaveStyle('opacity: 70%')
expect(button).toHaveStyle('box-shadow: 0 0 0')
})

it('renders secondary tertiary button with text and different background color', () => {
props.color = COLORS.red50
render(props)
Expand Down
8 changes: 4 additions & 4 deletions app/src/atoms/buttons/__tests__/RadioButton.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describe('RadioButton', () => {
}
render(props)
const label = screen.getByRole('label')
expect(label).toHaveStyle(`background-color: ${COLORS.blue40}`)
expect(label).toHaveStyle(`background-color: ${COLORS.blue35}`)
expect(label).toHaveStyle(`padding: ${SPACING.spacing24}`)
})
it('renders the large selected button', () => {
Expand All @@ -38,7 +38,7 @@ describe('RadioButton', () => {
}
render(props)
const label = screen.getByRole('label')
expect(label).toHaveStyle(`background-color: ${COLORS.blue60}`)
expect(label).toHaveStyle(`background-color: ${COLORS.blue50}`)
expect(label).toHaveStyle(`padding: ${SPACING.spacing24}`)
})
it('renders the small button', () => {
Expand All @@ -48,7 +48,7 @@ describe('RadioButton', () => {
}
render(props)
const label = screen.getByRole('label')
expect(label).toHaveStyle(`background-color: ${COLORS.blue40}`)
expect(label).toHaveStyle(`background-color: ${COLORS.blue35}`)
expect(label).toHaveStyle(`padding: ${SPACING.spacing20}`)
})
it('renders the small selected button', () => {
Expand All @@ -59,7 +59,7 @@ describe('RadioButton', () => {
}
render(props)
const label = screen.getByRole('label')
expect(label).toHaveStyle(`background-color: ${COLORS.blue60}`)
expect(label).toHaveStyle(`background-color: ${COLORS.blue50}`)
expect(label).toHaveStyle(`padding: ${SPACING.spacing20}`)
})
})
6 changes: 3 additions & 3 deletions app/src/atoms/buttons/__tests__/SmallButton.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ describe('SmallButton', () => {
fireEvent.click(screen.getByText('small button'))
expect(props.onClick).toHaveBeenCalled()
expect(screen.getByRole('button')).toHaveStyle(
`background-color: ${COLORS.blue60}`
`background-color: ${COLORS.blue50}`
)
expect(screen.getByRole('button')).toHaveStyle(
`border-radius: ${BORDERS.borderRadius16}`
Expand All @@ -38,7 +38,7 @@ describe('SmallButton', () => {
}
render(props)
expect(screen.getByRole('button')).toHaveStyle(
`background-color: ${COLORS.red55}`
`background-color: ${COLORS.red50}`
)
})
it('renders the secondary button', () => {
Expand All @@ -48,7 +48,7 @@ describe('SmallButton', () => {
}
render(props)
expect(screen.getByRole('button')).toHaveStyle(
`background-color: ${COLORS.blue40}`
`background-color: ${COLORS.blue35}`
)
})
it('renders the tertiary high light button', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ describe('SubmitPrimaryButton', () => {
it('renders submit primary button with text - active', () => {
render(props)
const button = screen.getByText('submit primary button')
expect(button).toHaveStyle(`background-color: ${COLORS.blue60}`)
expect(button).toHaveStyle(`background-color: ${COLORS.blue50}`)
expect(button).toHaveStyle(`border-radius: ${BORDERS.borderRadius8}`)
expect(button).toHaveStyle(
`padding: ${SPACING.spacing8} ${SPACING.spacing16}`
Expand Down
4 changes: 2 additions & 2 deletions app/src/atoms/buttons/__tests__/TabbedButton.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ describe('Unselected TabbedButton', () => {
it('renders unselected tabbed button with text', () => {
render(props)
const button = screen.getByText('tabbed button')
expect(button).toHaveStyle(`background-color: ${COLORS.purple40}`)
expect(button).toHaveStyle(`background-color: ${COLORS.purple35}`)
expect(button).toHaveStyle(
`padding: ${SPACING.spacing16} ${SPACING.spacing24}`
)
Expand Down Expand Up @@ -68,7 +68,7 @@ describe('Selected TabbedButton', () => {
it('renders selected tabbed button with text', () => {
render(props)
const button = screen.getByText('tabbed button')
expect(button).toHaveStyle(`background-color: ${COLORS.purple55}`)
expect(button).toHaveStyle(`background-color: ${COLORS.purple50}`)
expect(button).toHaveStyle(
`padding: ${SPACING.spacing16} ${SPACING.spacing24}`
)
Expand Down
4 changes: 2 additions & 2 deletions app/src/atoms/buttons/__tests__/TertiaryButton.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describe('TertiaryButton', () => {
it('renders tertiary button with text', () => {
render(props)
const button = screen.getByText('tertiary button')
expect(button).toHaveStyle(`background-color: ${COLORS.blue60}`)
expect(button).toHaveStyle(`background-color: ${COLORS.blue50}`)
expect(button).toHaveStyle(
`padding: ${SPACING.spacing8} ${SPACING.spacing16} ${SPACING.spacing8} ${SPACING.spacing16}`
)
Expand Down Expand Up @@ -52,7 +52,7 @@ describe('TertiaryButton', () => {
props.backgroundColor = COLORS.red50
render(props)
const button = screen.getByText('tertiary button')
expect(button).toHaveStyle(`background-color: ${COLORS.blue60}`)
expect(button).toHaveStyle(`background-color: ${COLORS.red50}`)
expect(button).toHaveStyle(`color: ${COLORS.white}`)
})
})
4 changes: 2 additions & 2 deletions app/src/atoms/buttons/__tests__/ToggleButton.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ describe('ToggleButton', () => {
it('renders toggle button - on', () => {
render(props)
const button = screen.getByLabelText('toggle button')
expect(button).toHaveStyle(`color: ${COLORS.blue55}`)
expect(button).toHaveStyle(`color: ${COLORS.blue50}`)
expect(button).toHaveStyle(`height: ${SIZE_2}`)
expect(button).toHaveStyle(`width: ${SIZE_2}`)
expect(button).toHaveAttribute('aria-checked', 'true')
Expand All @@ -52,7 +52,7 @@ describe('ToggleButton', () => {
props.toggledOn = false
render(props)
const button = screen.getByLabelText('toggle button')
expect(button).toHaveStyle(`color: ${COLORS.grey55}`)
expect(button).toHaveStyle(`color: ${COLORS.grey50}`)
expect(button).toHaveStyle(`height: ${SIZE_2}`)
expect(button).toHaveStyle(`width: ${SIZE_2}`)
expect(button).toHaveAttribute('aria-checked', 'false')
Expand Down
2 changes: 1 addition & 1 deletion app/src/molecules/CardButton/__tests__/CardButton.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ describe('CardButton', () => {
screen.getByText('Find a network in your lab or enter your own.')
expect(screen.getByTestId('cardButton_icon_wifi')).toBeInTheDocument()
const button = screen.getByRole('button')
expect(button).toHaveStyle(`background-color: ${COLORS.blue40}`)
expect(button).toHaveStyle(`background-color: ${COLORS.blue35}`)
})

it('renders the button as disabled', () => {
Expand Down
4 changes: 2 additions & 2 deletions app/src/molecules/MiniCard/__tests__/MiniCard.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ describe('MiniCard', () => {
it('renders the correct style unselectedOptionStyles', () => {
render(props)
const miniCard = screen.getByText('mock mini card')
expect(miniCard).toHaveStyle(`background-color: ${COLORS.grey10}`)
expect(miniCard).toHaveStyle(`border: 1px solid ${COLORS.grey35}`)
expect(miniCard).toHaveStyle(`background-color: ${COLORS.white}`)
expect(miniCard).toHaveStyle(`border: 1px solid ${COLORS.grey30}`)
expect(miniCard).toHaveStyle(`border-radius: ${BORDERS.borderRadius8}`)
expect(miniCard).toHaveStyle(`padding: ${SPACING.spacing8}`)
expect(miniCard).toHaveStyle(`width: 100%`)
Expand Down
2 changes: 1 addition & 1 deletion app/src/molecules/ModuleIcon/__tests__/ModuleIcon.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ describe('ModuleIcon', () => {
it('renders SharedIcon with correct style', () => {
render(props)
const module = screen.getByTestId('ModuleIcon_ot-temperature-v2')
expect(module).toHaveStyle(`color: ${COLORS.black90}`)
expect(module).toHaveStyle(`color: ${COLORS.grey60}`)
expect(module).toHaveStyle(`height: ${SPACING.spacing16}`)
expect(module).toHaveStyle(`width: ${SPACING.spacing16}`)
expect(module).toHaveStyle(`margin-left: ${SPACING.spacing2}`)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ describe('RecentRunProtocolCard', () => {
it('when tapping a card, mock functions is called and loading state is activated', () => {
render(props)
const button = screen.getByLabelText('RecentRunProtocolCard')
expect(button).toHaveStyle(`background-color: ${COLORS.green40}`)
expect(button).toHaveStyle(`background-color: ${COLORS.green35}`)
fireEvent.click(button)
expect(mockTrackEvent).toHaveBeenCalledWith({
name: ANALYTICS_PROTOCOL_PROCEED_TO_RUN,
Expand Down
Loading