Skip to content

Commit

Permalink
lint and type fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mjhuff committed Mar 7, 2024
1 parent b67728b commit 405e9bc
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 2 additions & 0 deletions app/src/atoms/MenuList/__tests__/OverflowBtn.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ describe('OverflowBtn', () => {
onClick: vi.fn(),
})

// @ts-expect-error Refactor to test modifier states.
expect(getByRole('button')).toHaveStyleRule(
'box-shadow',
`0 0 0 3px ${String(COLORS.yellow50)}`,
Expand All @@ -62,6 +63,7 @@ describe('OverflowBtn', () => {
onClick: vi.fn(),
})

// @ts-expect-error Refactor to test modifier states.
expect(getByRole('button')).toHaveStyleRule(
'fill',
`${String(COLORS.grey40)}`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ import type { Mock } from 'vitest'
import type * as OpentronsSharedData from '@opentrons/shared-data'
import type * as OpentronsComponents from '@opentrons/components'
import type * as OpentronsApiClient from '@opentrons/api-client'
import type { Run } from '@opentrons/api-client'

const mockPush = vi.fn()

Expand Down Expand Up @@ -349,7 +348,7 @@ describe('ProtocolRunHeader', () => {
vi.mocked(useDeckConfigurationCompatibility).mockReturnValue([])
vi.mocked(getIsFixtureMismatch).mockReturnValue(false)
vi.mocked(useMostRecentRunId).mockReturnValue(RUN_ID)
vi.mocked(useRobot).mockReturnValue({
vi.mocked(useRobot).mockReturnValue({
...mockConnectableRobot,
health: {
...mockConnectableRobot.health,
Expand Down Expand Up @@ -821,7 +820,7 @@ describe('ProtocolRunHeader', () => {
.calledWith(RUN_ID)
.thenReturn({
data: { data: mockSucceededRun },
} as UseQueryResult<Run>)
} as UseQueryResult<OpentronsApiClient.Run>)
when(vi.mocked(useRunStatus))
.calledWith(RUN_ID)
.thenReturn(RUN_STATUS_SUCCEEDED)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { handleTipsAttachedModal } from '../TipsAttachedModal'
import { LEFT } from '@opentrons/shared-data'
import { mockPipetteInfo } from '../../../redux/pipettes/__fixtures__'
import { ROBOT_MODEL_OT3 } from '../../../redux/discovery'
import { useNotifyService } from '../../../resources/useNotifyService'
import { useNotifyCurrentMaintenanceRun } from '../../../resources/maintenance_runs/useNotifyCurrentMaintenanceRun'

import type { PipetteModelSpecs } from '@opentrons/shared-data'
Expand Down
6 changes: 3 additions & 3 deletions shared-data/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# using bash instead of /bin/bash in SHELL prevents macOS optimizing away our PATH update
SHELL := bash

# These variables can be overridden when make is invoked to customize the
# These variables can be overriden when make is invoked to customize the
# behavior of jest
tests ?=
cov_opts ?= --coverage=true --ci=true --collectCoverageFrom='shared-data/js/**/*.(js|ts|tsx)'
cov_opts ?= --coverage=true --collectCoverageFrom='shared-data/js/**/*.(js|ts|tsx)'
test_opts ?=

# Top level targets
Expand All @@ -28,7 +28,7 @@ clean: clean-py
.PHONY: lib-js
lib-js: export NODE_ENV := production
lib-js:
yarn vite build
NODE_OPTIONS=--openssl-legacy-provider yarn vite build



Expand Down

0 comments on commit 405e9bc

Please sign in to comment.