Skip to content

Commit cdf7a19

Browse files
committed
fix some warnings in test output
fix deprecated calls in WorkbenchPage.spec.tsx changed the test for `check button clickable and selected` to test if the actual action is executed because rerendering seems to not play well with styled components
1 parent 115b0f4 commit cdf7a19

File tree

3 files changed

+27
-17
lines changed

3 files changed

+27
-17
lines changed

redisinsight/ui/src/components/base/link/Link.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import React from 'react'
22
export { type LinkProps } from '@redis-ui/components'
3-
import { StyledLink, RiLinkProps } from 'uiSrc/components/base/link/link.styles'
3+
import {
4+
StyledLink,
5+
type RiLinkProps,
6+
} from 'uiSrc/components/base/link/link.styles'
47
export { type RiLinkProps }
58

69
export const Link = ({ color, ...props }: RiLinkProps) => (

redisinsight/ui/src/components/base/link/link.styles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export type RiLinkProps = Omit<LinkProps, 'color'> & {
2121
color?: ColorType
2222
}
2323

24-
export interface MapProps extends RiLinkProps {
24+
type MapProps = RiLinkProps & {
2525
$color?: ColorType
2626
}
2727

redisinsight/ui/src/pages/workbench/WorkbenchPage.spec.tsx

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
mockedStore,
1313
render,
1414
screen,
15+
userEvent,
1516
waitForRiTooltipVisible,
1617
} from 'uiSrc/utils/test-utils'
1718
import WorkbenchPage from './WorkbenchPage'
@@ -137,7 +138,7 @@ describe('Telemetry', () => {
137138
// turn on Raw mode
138139
fireEvent.click(screen.getByTestId('btn-change-mode'))
139140

140-
expect(sendEventTelemetry).toBeCalledWith({
141+
expect(sendEventTelemetry).toHaveBeenCalledWith({
141142
event: TelemetryEvent.WORKBENCH_MODE_CHANGED,
142143
eventData: {
143144
databaseId: INSTANCE_ID_MOCK,
@@ -159,7 +160,7 @@ describe('Telemetry', () => {
159160
// send command without Raw mode
160161
fireEvent.click(screen.getByTestId('btn-submit'))
161162

162-
expect(sendEventTelemetry).toBeCalledWith({
163+
expect(sendEventTelemetry).toHaveBeenCalledWith({
163164
event: TelemetryEvent.WORKBENCH_COMMAND_SUBMITTED,
164165
eventData: {
165166
command: 'INFO',
@@ -184,7 +185,7 @@ describe('Telemetry', () => {
184185
// send command with Raw mode
185186
fireEvent.click(screen.getByTestId('btn-submit'))
186187

187-
expect(sendEventTelemetry).toBeCalledWith({
188+
expect(sendEventTelemetry).toHaveBeenCalledWith({
188189
event: TelemetryEvent.WORKBENCH_COMMAND_SUBMITTED,
189190
eventData: {
190191
command: 'INFO',
@@ -208,7 +209,7 @@ describe('Telemetry', () => {
208209

209210
fireEvent.click(screen.getByTestId('re-run-command'))
210211

211-
expect(sendEventTelemetry).toBeCalledWith({
212+
expect(sendEventTelemetry).toHaveBeenCalledWith({
212213
event: TelemetryEvent.WORKBENCH_COMMAND_RUN_AGAIN,
213214
eventData: {
214215
auto: undefined,
@@ -233,7 +234,7 @@ describe('Telemetry', () => {
233234

234235
fireEvent.click(screen.getByTestId('delete-command'))
235236

236-
expect(sendEventTelemetry).toBeCalledWith({
237+
expect(sendEventTelemetry).toHaveBeenCalledWith({
237238
event: TelemetryEvent.WORKBENCH_CLEAR_RESULT_CLICKED,
238239
eventData: {
239240
databaseId: 'instanceId',
@@ -244,7 +245,7 @@ describe('Telemetry', () => {
244245

245246
fireEvent.click(screen.getByTestId('clear-history-btn'))
246247

247-
expect(sendEventTelemetry).toBeCalledWith({
248+
expect(sendEventTelemetry).toHaveBeenCalledWith({
248249
event: TelemetryEvent.WORKBENCH_CLEAR_ALL_RESULTS_CLICKED,
249250
eventData: {
250251
databaseId: 'instanceId',
@@ -306,21 +307,27 @@ describe('Raw mode', () => {
306307
})
307308

308309
it('check button clickable and selected', async () => {
310+
const sendEventTelemetryMock = jest.fn()
311+
;(sendEventTelemetry as jest.Mock).mockImplementation(
312+
() => sendEventTelemetryMock,
313+
)
314+
309315
render(<WorkbenchPage />)
310316

311317
const btn = screen.getByTestId(/btn-change-mode/)
312318

313319
expect(btn).not.toBeDisabled()
314-
expect(btn).toHaveStyle('background: #000 !important')
315-
316-
fireEvent.click(btn)
317-
318-
expect(btn).toHaveStyle(
319-
'background: var(--browserComponentActive) !important',
320-
)
321320

322-
fireEvent.click(btn)
321+
await userEvent.click(btn)
323322

324-
expect(btn).toHaveStyle('background: #000 !important')
323+
expect(sendEventTelemetry).toHaveBeenCalledWith({
324+
event: TelemetryEvent.WORKBENCH_MODE_CHANGED,
325+
eventData: {
326+
databaseId: INSTANCE_ID_MOCK,
327+
changedFromMode: RunQueryMode.ASCII,
328+
changedToMode: RunQueryMode.Raw,
329+
},
330+
})
331+
;(sendEventTelemetry as jest.Mock).mockRestore()
325332
})
326333
})

0 commit comments

Comments
 (0)