Merge branch 'main' into dev-v3-philosr-file-token-group-fix

Author: Who-is-PS

package.json

@@ -25,6 +25,7 @@
     "start:integ": "cross-env NODE_ENV=development webpack serve --config pages/webpack.config.integ.cjs",
     "start:react18": "npm-run-all --parallel start:watch start:react18:dev",
     "start:react18:dev": "cross-env NODE_ENV=development REACT_VERSION=18 webpack serve --config pages/webpack.config.cjs",
+    "postinstall": "prepare-package-lock",
     "prepare": "husky"
   },
   "dependencies": {

src/button-dropdown/__integ__/performance-marks.test.ts

@@ -1,48 +1,35 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+
 import { BasePageObject } from '@cloudscape-design/browser-test-tools/page-objects';
 import useBrowser from '@cloudscape-design/browser-test-tools/use-browser';
 
-function setupTest(
-  pageName: string,
-  testFn: (parameters: {
-    page: BasePageObject;
-    getMarks: () => Promise<PerformanceMark[]>;
-    getElementPerformanceMarkText: (id: string) => Promise<string>;
-  }) => Promise<void>
-) {
-  return useBrowser(async browser => {
-    const page = new BasePageObject(browser);
-    await browser.url(`#/light/button-dropdown/${pageName}`);
-    const getMarks = async () => {
-      await new Promise(r => setTimeout(r, 200));
-      const marks = await browser.execute(() => performance.getEntriesByType('mark') as PerformanceMark[]);
-      return marks.filter(m => m.detail?.source === 'awsui');
-    };
-    const getElementPerformanceMarkText = (id: string) => page.getText(`[data-analytics-performance-mark="${id}"]`);
-
-    await testFn({ page, getMarks, getElementPerformanceMarkText });
-  });
+function getMarkSelector(mark: PerformanceMark) {
+  return `[data-analytics-performance-mark="${mark.detail.instanceIdentifier}"]`;
 }
 
-describe('ButtonDropdown', () => {
-  test(
-    'Emits a single mark',
-    setupTest('main-action', async ({ getMarks, getElementPerformanceMarkText }) => {
-      const marks = await getMarks();
+test(
+  'ButtonDropdown emits a single mark',
+  useBrowser(async browser => {
+    const page = new BasePageObject(browser);
+    await browser.url('#/light/button-dropdown/main-action');
+    await new Promise(r => setTimeout(r, 200));
+
+    await page.waitForAssertion(async () => {
+      const allMarks = await browser.execute(() => performance.getEntriesByType('mark') as PerformanceMark[]);
+      const awsuiMarks = allMarks.filter(m => m.detail?.source === 'awsui');
 
-      expect(marks).toHaveLength(1);
-      expect(marks[0].name).toBe('primaryButtonRendered');
-      expect(marks[0].detail).toMatchObject({
+      expect(awsuiMarks).toHaveLength(1);
+      expect(awsuiMarks[0].name).toBe('primaryButtonRendered');
+      expect(awsuiMarks[0].detail).toMatchObject({
         source: 'awsui',
         instanceIdentifier: expect.any(String),
         loading: false,
         disabled: false,
         inViewport: true,
         text: 'Launch instance',
       });
-
-      await expect(getElementPerformanceMarkText(marks[0].detail.instanceIdentifier)).resolves.toBe('Launch instance');
-    })
-  );
-});
+      await expect(page.getText(getMarkSelector(awsuiMarks[0]))).resolves.toBe('Launch instance');
+    });
+  })
+);

src/flashbar/__integ__/collapsible.test.ts

@@ -135,8 +135,8 @@ describe('Collapsible Flashbar', () => {
         await page.setWindowSize(windowDimensions);
         await page.toggleCollapsedState();
         expect(await page.getNotificationBarBottom()).toBeGreaterThan(windowDimensions.height);
-        await page.windowScrollTo({ top: 1200 });
         await page.waitForAssertion(async () => {
+          await page.windowScrollTo({ top: 1200 });
           await expect(page.getNotificationBarBottom()).resolves.toBeLessThan(windowDimensions.height);
         });
       })