diff --git a/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/synthetics/check_steps/steps_list.test.tsx b/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/synthetics/check_steps/steps_list.test.tsx index 00b40415adefbcc..82c5bbf472eceb9 100644 --- a/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/synthetics/check_steps/steps_list.test.tsx +++ b/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/synthetics/check_steps/steps_list.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { JourneyStep } from '../../../../../common/runtime_types/ping'; import { StepsList } from './steps_list'; -import { render, forDesktopOnly, forMobileOnly } from '../../../lib/helper/rtl_helpers'; +import { render } from '../../../lib/helper/rtl_helpers'; import { VIEW_PERFORMANCE } from '../../monitor/synthetics/translations'; describe('StepList component', () => { @@ -83,7 +83,7 @@ describe('StepList component', () => { ); expect(getByTestId('step-detail-link')).toHaveAttribute('href', '/journey/fake-group/step/1'); - expect(forDesktopOnly(getByTitle, 'title')(`Failed`)); + expect(getByTitle(`Failed`)).toBeInTheDocument(); }); it.each([ @@ -94,7 +94,7 @@ describe('StepList component', () => { const step = steps[0]; step.synthetics!.payload!.status = status; const { getByText } = render(); - expect(forDesktopOnly(getByText)(expectedStatus)); + expect(getByText(expectedStatus)).toBeInTheDocument(); }); it('creates expected message for all succeeded', () => { @@ -156,24 +156,27 @@ describe('StepList component', () => { }); describe('Mobile Designs', () => { - // We don't need to resize the window here because EUI - // does all the manipulation of what is displayed through - // CSS. Therefore, it's enough to check what's actually - // rendered and its classes. + const jestWindowWidth = window.innerWidth; + beforeAll(() => { + window.innerWidth = 600; + }); + afterAll(() => { + window.innerWidth = jestWindowWidth; + }); it('renders the step name and index', () => { const { getByText } = render( ); - expect(forMobileOnly(getByText)('1. load page')).toBeInTheDocument(); - expect(forMobileOnly(getByText)('2. go to login')).toBeInTheDocument(); + expect(getByText('1. load page')).toBeInTheDocument(); + expect(getByText('2. go to login')).toBeInTheDocument(); }); it('does not render the link to view step details', async () => { const { queryByText } = render( ); - expect(forMobileOnly(queryByText)(VIEW_PERFORMANCE)).not.toBeInTheDocument(); + expect(queryByText(VIEW_PERFORMANCE)).not.toBeInTheDocument(); }); it('renders the status label', () => { @@ -183,8 +186,8 @@ describe('StepList component', () => { const { getByText } = render( ); - expect(forMobileOnly(getByText)('Succeeded')).toBeInTheDocument(); - expect(forMobileOnly(getByText)('Skipped')).toBeInTheDocument(); + expect(getByText('Succeeded')).toBeInTheDocument(); + expect(getByText('Skipped')).toBeInTheDocument(); }); }); }); diff --git a/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/lib/helper/rtl_helpers.tsx b/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/lib/helper/rtl_helpers.tsx index 0b23c089385d7c1..9ca652edb9cc48c 100644 --- a/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/lib/helper/rtl_helpers.tsx +++ b/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/lib/helper/rtl_helpers.tsx @@ -356,38 +356,3 @@ export const makeUptimePermissionsCore = ( }, }; }; - -// This function filters out the queried elements which appear only -// either on mobile or desktop. -// -// It does so by filtering those with the class passed as the `classWrapper`. -// For mobile, we filter classes which tell elements to be hidden on desktop. -// For desktop, we do the opposite. -// -// We have this function because EUI will manipulate the visibility of some -// elements through pure CSS, which we can't assert on tests. Therefore, -// we look for the corresponding class wrapper. -const finderWithClassWrapper = - (classWrapper: string) => - ( - getterFn: (f: MatcherFunction) => HTMLElement | null, - customAttribute?: keyof Element | keyof HTMLElement - ) => - (text: string): HTMLElement | null => - getterFn((_content: string, node: Element | null) => { - if (!node) return false; - // There are actually properties that are not in Element but which - // appear on the `node`, so we must cast the customAttribute as a keyof Element - const content = node[(customAttribute as keyof Element) ?? 'innerHTML']; - if (content === text && wrappedInClass(node, classWrapper)) return true; - return false; - }); - -const wrappedInClass = (element: HTMLElement | Element, classWrapper: string): boolean => { - if (element.className.includes(classWrapper)) return true; - if (element.parentElement) return wrappedInClass(element.parentElement, classWrapper); - return false; -}; - -export const forMobileOnly = finderWithClassWrapper('hideForDesktop'); -export const forDesktopOnly = finderWithClassWrapper('hideForMobile'); diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/event_fields_browser.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/event_fields_browser.test.tsx index cfe1def2b9da2e9..570029e1c3c0ba6 100644 --- a/x-pack/plugins/security_solution/public/common/components/event_details/event_fields_browser.test.tsx +++ b/x-pack/plugins/security_solution/public/common/components/event_details/event_fields_browser.test.tsx @@ -17,14 +17,6 @@ import { TimelineTabs } from '../../../../common/types/timeline'; jest.mock('../../lib/kibana'); -jest.mock('@elastic/eui', () => { - const original = jest.requireActual('@elastic/eui'); - return { - ...original, - EuiScreenReaderOnly: () => <>, - }; -}); - jest.mock('../../hooks/use_get_field_spec'); jest.mock('@kbn/cell-actions/src/hooks/use_load_actions', () => {