Merge pull request #36 from lolmaus/bugfix/issue-35-wait-for-initial

Wait for initial element query attributes in tests, fixes #35

Author: lolmaus

.github/workflows/ci.yml

@@ -59,8 +59,8 @@ jobs:
           - ember-lts-3.16
           - ember-lts-3.20
           - ember-release
-          - ember-beta
-          - ember-canary
+          # - ember-beta
+          # - ember-canary
           - ember-default-with-jquery
           - ember-classic
     steps:

.travis.yml

@@ -11,6 +11,7 @@ import {
   SIZES_HEIGHT_DEFAULT,
 } from 'ember-element-query';
 import { inject as service } from '@ember/service';
+import { waitFor } from '@ember/test-waiters';
 export interface SizeObject {
   name: string;
   value: number;
@@ -22,6 +23,7 @@ export type RangeDirection = 'at' | 'from' | 'to';
 interface ResizeObserverService {
   observe(element: HTMLElement, callback?: () => void): void;
   unobserve(element: HTMLElement, callback?: () => void): void;
+  isEnabled: boolean;
 }
 
 /** @internal */
@@ -41,6 +43,7 @@ export default class ElementQueryModifier extends Modifier<ModifierArgs> {
   sizesRatioDefault: Sizes = SIZES_RATIO_DEFAULT;
 
   _element?: HTMLElement; // For some reason, this.element is not always available
+  _promiseResolveHasBeenInstalled?: (value?: unknown) => void;
 
   // -------------------
   // Computed properties
@@ -541,12 +544,20 @@ export default class ElementQueryModifier extends Modifier<ModifierArgs> {
       : sizeObjectsSortedAsc[sizeObjectsSortedAsc.length - 1];
   }
 
+  _maybeRunPromiseResolveHasBeenInstalled(): void {
+    if (this._promiseResolveHasBeenInstalled) {
+      this._promiseResolveHasBeenInstalled();
+      this._promiseResolveHasBeenInstalled = undefined;
+    }
+  }
+
   _didResizeHandler(): void {
     window.requestAnimationFrame(() => {
       if (!this.args.named.isDisabled && !this.isDestroying && !this.isDestroyed) {
         this.applyAttributesToElement();
         this.callOnResize();
       }
+      this._maybeRunPromiseResolveHasBeenInstalled?.();
     });
   }
 
@@ -561,18 +572,25 @@ export default class ElementQueryModifier extends Modifier<ModifierArgs> {
   // -------------------
   // Lifecycle hooks
   // -------------------
-
-  didInstall(): void {
+  @waitFor
+  didInstall(): void | Promise<void> {
     if (!this.element) throw new Error('Expected this.element to be available');
 
     this._element = this.element;
 
     this.resizeObserver.observe(this.element, this.didResizeHandler); // eslint-disable-line @typescript-eslint/unbound-method
+
+    if (!this.args.named.isDisabled && this.resizeObserver.isEnabled) {
+      return new Promise((resolve) => {
+        this._promiseResolveHasBeenInstalled = resolve;
+      });
+    } else {
+      return Promise.resolve();
+    }
   }
 
   didUpdateArguments(): void {
-    // @ts-ignore https://github.com/Microsoft/TypeScript/issues/28502#issuecomment-609607344
-    if (!ResizeObserver) return;
+    if (!this.resizeObserver.isEnabled) return;
 
     this.didResizeHandler();
   }

addon/-private/modifier.ts

@@ -67,6 +67,7 @@
     }
   },
   "dependencies": {
+    "@ember/test-waiters": "^3.0.0",
     "ember-cli-babel": "^7.26.3",
     "ember-cli-htmlbars": "5.7.1",
     "ember-cli-typescript": "^4.2.1",

package.json

@@ -1826,6 +1826,16 @@
     ember-cli-version-checker "^5.1.2"
     semver "^7.3.2"
 
+"@ember/test-waiters@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-3.0.0.tgz#b66a35cd5b78ec3c296a6f5f5fb3852780a5d3c8"
+  integrity sha512-z6+gIlq/rXLKroWv2wxAoiiLtgSOGQFCw6nUufERausV+jLnA7CYbWwzEo5R7XaOejSDpgA5d6haXIBsD5j0oQ==
+  dependencies:
+    calculate-cache-key-for-tree "^2.0.0"
+    ember-cli-babel "^7.26.6"
+    ember-cli-version-checker "^5.1.2"
+    semver "^7.3.5"
+
 "@embroider/core@0.33.0", "@embroider/core@^0.33.0":
   version "0.33.0"
   resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.33.0.tgz#0fb1752d6e34ea45368e65c42e13220a57ffae76"