test: update tests due to lazy loading dependencies

Signed-off-by: Rong Sen Ng (motss) <wes.ngrongsen@gmail.com>
motss · Feb 20, 2022 · c201c14 · c201c14
1 parent b3c32f2
commit c201c14
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/src/__tests__/date-picker-dialog/app-date-picker-dialog.test.ts b/src/__tests__/date-picker-dialog/app-date-picker-dialog.test.ts
@@ -1,3 +1,4 @@
+import '../../date-picker/app-date-picker';
 import '../../date-picker-dialog/app-date-picker-dialog';
 
 import type { Button } from '@material/mwc-button';

diff --git a/src/__tests__/date-picker-input/app-date-picker-input.test.ts b/src/__tests__/date-picker-input/app-date-picker-input.test.ts
@@ -1,5 +1,6 @@
-import '../../date-picker-input-surface/app-date-picker-input-surface';
+import '../../date-picker/app-date-picker';
 import '../../date-picker-input/app-date-picker-input';
+import '../../date-picker-input-surface/app-date-picker-input-surface';
 
 import type { Button } from '@material/mwc-button';
 import { expect, fixture, html } from '@open-wc/testing';

diff --git a/src/date-picker-input/date-picker-input.ts b/src/date-picker-input/date-picker-input.ts
@@ -281,12 +281,19 @@ export class DatePickerInput extends ElementMixin(DatePickerMixin(DatePickerMinM
   }
 
   async #lazyLoad() {
-    const pickerTask = globalThis.customElements.whenDefined(appDatePickerName);
-    const surfaceTask = globalThis.customElements.whenDefined(appDatePickerInputSurfaceName);
-
-    await this.lazyLoad?.();
-    await pickerTask;
-    await surfaceTask;
+    const deps = [
+      appDatePickerName,
+      appDatePickerInputSurfaceName,
+    ];
+
+    if (deps.some(n => globalThis.customElements.get(n) == null)) {
+      const tasks = deps.map(
+        n => globalThis.customElements.whenDefined(n)
+      );
+
+      await this.lazyLoad?.();
+      await Promise.all(tasks);
+    }
 
     this._rendered = true;
   }