More PR feedback.

ni · Oct 23, 2024 · 959e9db · 959e9db
1 parent ee1486f
commit 959e9db
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 22 deletions.
diff --git a/packages/nimble-components/src/patterns/tabs/testing/tabs-base.pageobject.ts b/packages/nimble-components/src/patterns/tabs/testing/tabs-base.pageobject.ts
@@ -1,6 +1,6 @@
 import type { Button } from '../../../button';
 import { waitForUpdatesAsync } from '../../../testing/async-helpers';
-import { timeout } from '../../../utilities/testing/timeout';
+import { waitTimeout } from '../../../utilities/testing/component';
 import type { TabsOwner } from '../types';
 
 /**
@@ -46,7 +46,7 @@ export abstract class TabsBasePageObject<T extends TabsOwner> {
         }
         leftButton.click();
         await waitForUpdatesAsync();
-        await timeout(50); // let animation run
+        await waitTimeout(50); // let animation run
     }
 
     public async clickScrollRightButton(): Promise<void> {
@@ -58,7 +58,7 @@ export abstract class TabsBasePageObject<T extends TabsOwner> {
         }
         rightButton.click();
         await waitForUpdatesAsync();
-        await timeout(50); // let animation run
+        await waitTimeout(50); // let animation run
     }
 
     public areScrollButtonsVisible(): boolean {

diff --git a/packages/nimble-components/src/select/tests/select.foundation.spec.ts b/packages/nimble-components/src/select/tests/select.foundation.spec.ts
@@ -15,7 +15,7 @@ import { fixture } from '../../utilities/tests/fixture';
 import { template } from '../template';
 import { ListOption, listOptionTag } from '../../list-option';
 import { template as listOptionTemplate } from '../../list-option/template';
-import { timeout } from '../../utilities/testing/timeout';
+import { waitTimeout } from '../../utilities/testing/component';
 
 describe('Select', () => {
     const select = Select.compose({
@@ -422,7 +422,7 @@ describe('Select', () => {
                     element.addEventListener('input', () => resolve(true));
                     element.dispatchEvent(event);
                 }),
-                timeout().then(() => false)
+                waitTimeout().then(() => false)
             ]);
 
             expect(wasInput).toBeFalse();
@@ -454,7 +454,7 @@ describe('Select', () => {
                     element.addEventListener('input', () => resolve(true));
                     element.dispatchEvent(event);
                 }),
-                timeout().then(() => false)
+                waitTimeout().then(() => false)
             ]);
 
             expect(wasInput).toBeFalse();
@@ -482,7 +482,7 @@ describe('Select', () => {
                     element.addEventListener('input', () => resolve(true));
                     element.dispatchEvent(event);
                 }),
-                timeout().then(() => false)
+                waitTimeout().then(() => false)
             ]);
 
             expect(wasInput).toBeFalse();
@@ -512,7 +512,7 @@ describe('Select', () => {
                     element.addEventListener('input', () => resolve(true));
                     element.dispatchEvent(event);
                 }),
-                timeout().then(() => false)
+                waitTimeout().then(() => false)
             ]);
 
             expect(wasInput).toBeFalse();
@@ -672,7 +672,7 @@ describe('Select', () => {
                         );
                         element.dispatchEvent(arrowUpEvent);
                     }),
-                    timeout().then(() => false)
+                    waitTimeout().then(() => false)
                 ])
             ).toBeTrue();
 
@@ -688,7 +688,7 @@ describe('Select', () => {
                         );
                         element.dispatchEvent(arrowDownEvent);
                     }),
-                    timeout().then(() => false)
+                    waitTimeout().then(() => false)
                 ])
             ).toBeTrue();
 
@@ -719,7 +719,7 @@ describe('Select', () => {
                     element.addEventListener('input', () => resolve(true));
                     element.dispatchEvent(event);
                 }),
-                timeout().then(() => false)
+                waitTimeout().then(() => false)
             ]);
 
             expect(wasInput).toBeTrue();
@@ -749,7 +749,7 @@ describe('Select', () => {
                     element.addEventListener('input', () => resolve(true));
                     element.dispatchEvent(event);
                 }),
-                timeout().then(() => false)
+                waitTimeout().then(() => false)
             ]);
 
             expect(wasInput).toBeTrue();
@@ -779,7 +779,7 @@ describe('Select', () => {
                     element.addEventListener('input', () => resolve(true));
                     element.dispatchEvent(event);
                 }),
-                timeout().then(() => false)
+                waitTimeout().then(() => false)
             ]);
 
             expect(wasInput).toBeTrue();
@@ -805,7 +805,7 @@ describe('Select', () => {
                     element.addEventListener('input', () => resolve(true));
                     element.dispatchEvent(event);
                 }),
-                timeout().then(() => false)
+                waitTimeout().then(() => false)
             ]);
 
             expect(wasInput).toBeTrue();

diff --git a/packages/nimble-components/src/utilities/testing/component.ts b/packages/nimble-components/src/utilities/testing/component.ts
@@ -70,3 +70,12 @@ export async function waitAnimationFrame(): Promise<void> {
         requestAnimationFrame(() => resolve());
     });
 }
+
+/**
+ * Timeout for use in async tets.
+ */
+export async function waitTimeout(ms = 0): Promise<void> {
+    await new Promise(resolve => {
+        window.setTimeout(() => resolve(undefined), ms);
+    });
+}
diff --git a/packages/nimble-components/src/utilities/testing/timeout.ts b/packages/nimble-components/src/utilities/testing/timeout.ts