reduce diff

Author: just-boris

src/app-layout-toolbar/__tests__/analytics-metadata.test.tsx

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import React from 'react';
-import { act, render, waitFor } from '@testing-library/react';
+import { act, render } from '@testing-library/react';
 
 import {
   activateAnalyticsMetadata,
@@ -125,7 +125,7 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
     });
   });
   describe('with tools', () => {
-    test('closed', async () => {
+    test('closed', () => {
       const wrapper = renderToolbar({
         tools: <span>tools</span>,
         toolsOpen: false,
@@ -134,9 +134,6 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
           toolsToggle: 'toggle tools',
         },
       });
-      await waitFor(() => {
-        expect(wrapper.findToolsToggle()).toBeTruthy();
-      });
       const toolsTrigger = wrapper.findToolsToggle().getElement();
       validateComponentNameAndLabels(toolsTrigger, {});
       expect(getGeneratedAnalyticsMetadata(toolsTrigger)).toEqual({
@@ -147,7 +144,7 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
         ...getMetadata(),
       });
     });
-    test('open', async () => {
+    test('open', () => {
       const wrapper = renderToolbar({
         tools: <span>tools</span>,
         toolsOpen: true,
@@ -157,9 +154,6 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
           toolsClose: 'close tools',
         },
       });
-      await waitFor(() => {
-        expect(wrapper.findToolsToggle()).toBeTruthy();
-      });
       const toolsTrigger = wrapper.findToolsToggle().getElement();
       validateComponentNameAndLabels(toolsTrigger, {});
       expect(getGeneratedAnalyticsMetadata(toolsTrigger)).toEqual({
@@ -180,7 +174,7 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
   });
 
   describe('with local drawer', () => {
-    test('closed', async () => {
+    test('closed', () => {
       const wrapper = renderToolbar({
         drawers: [
           {
@@ -197,9 +191,6 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
           },
         ],
       });
-      await waitFor(() => {
-        expect(wrapper.findDrawerTriggerById('test-drawer')).toBeTruthy();
-      });
       const drawerTrigger = wrapper.findDrawerTriggerById('test-drawer')!.getElement();
       validateComponentNameAndLabels(drawerTrigger, {});
       expect(getGeneratedAnalyticsMetadata(drawerTrigger)).toEqual({
@@ -210,7 +201,7 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
         ...getMetadata(),
       });
     });
-    test('open', async () => {
+    test('open', () => {
       const wrapper = renderToolbar({
         drawers: [
           {
@@ -241,9 +232,6 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
         activeDrawerId: 'test-drawer',
         onDrawerChange: () => {},
       });
-      await waitFor(() => {
-        expect(wrapper.findDrawerTriggerById('test-drawer')).toBeTruthy();
-      });
       const drawerTrigger = wrapper.findDrawerTriggerById('test-drawer')!.getElement();
       validateComponentNameAndLabels(drawerTrigger, {});
       expect(getGeneratedAnalyticsMetadata(drawerTrigger)).toEqual({
@@ -331,7 +319,7 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
   });
 
   describe('with split panel', () => {
-    test.each(['open', 'close'])('%s', async action => {
+    test.each(['open', 'close'])('%s', action => {
       const wrapper = renderToolbar({
         splitPanel: (
           <SplitPanel i18nStrings={{ openButtonAriaLabel: 'open split panel' }} header="Split panel header">
@@ -341,9 +329,6 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
         splitPanelOpen: action !== 'open',
         onSplitPanelToggle: () => {},
       });
-      await waitFor(() => {
-        expect(wrapper.findSplitPanelOpenButton()).toBeTruthy();
-      });
       const splitPanelTrigger = wrapper.findSplitPanelOpenButton()!.getElement();
       validateComponentNameAndLabels(splitPanelTrigger, {});
       expect(getGeneratedAnalyticsMetadata(splitPanelTrigger)).toEqual({

src/app-layout-toolbar/__tests__/app-layout-toolbar.test.tsx

@@ -1,12 +1,13 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-/* eslint simple-import-sort/imports: 0 */
 import React, { useRef, useState } from 'react';
-import { render } from '@testing-library/react';
+import { render, waitFor } from '@testing-library/react';
+
 import { clearVisualRefreshState } from '@cloudscape-design/component-toolkit/internal/testing';
+
 import AppLayoutToolbar, { AppLayoutToolbarProps } from '../../../lib/components/app-layout-toolbar';
-import createWrapper from '../../../lib/components/test-utils/dom';
 import BreadcrumbGroup from '../../../lib/components/breadcrumb-group';
+import createWrapper from '../../../lib/components/test-utils/dom';
 
 function renderComponent(jsx: React.ReactElement) {
   const { container, rerender } = render(jsx);
@@ -35,7 +36,7 @@ describe('AppLayoutToolbar component', () => {
     );
   });
 
-  test('triggerless navigation', () => {
+  test('triggerless navigation', async () => {
     const AppLayoutToolbarWrapper = () => {
       const [isNavigationOpen, setIsNavigationOpen] = useState(false);
       const appLayoutToolbarRef = useRef<AppLayoutToolbarProps.Ref>(null);
@@ -72,8 +73,9 @@ describe('AppLayoutToolbar component', () => {
     wrapper.find(`[data-testid="toggle-navigation"]`)!.click();
 
     expect(wrapper.findOpenNavigationPanel()).toBeTruthy();
-    // TODO: for some reason this does not work in the JSDOM env, but does in an actual browser
-    // expect(wrapper.findNavigationClose()!.getElement()).toHaveFocus();
+    await waitFor(() => {
+      expect(wrapper.findNavigationClose()!.getElement()).toHaveFocus();
+    });
   });
 
   test('triggerless drawers', () => {

src/app-layout/__integ__/awsui-applayout.test.ts

@@ -199,7 +199,7 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as Theme[])('%s', theme
     })
   );
 
-  (theme !== 'classic' ? test.skip : test.skip)(
+  (theme !== 'classic' ? test : test.skip)(
     'element should not be hidden under the sticky header when focused',
     setupTest({ pageName: 'global-scroll-padding' }, async page => {
       // Getting the header offset depending on the theme