Fix tests

dmnsgn · Mar 17, 2019 · 4b15e3f · 4b15e3f
1 parent 4c6e59c
commit 4b15e3f
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 68 deletions.
diff --git a/dist/fontfaceobserver.cjs.js b/dist/fontfaceobserver.cjs.js
diff --git a/dist/fontfaceobserver.esm.js b/dist/fontfaceobserver.esm.js
@@ -400,32 +400,30 @@ var FontFaceObserver = function () {
               var now = that.getTime();
 
               if (now - start >= timeoutValue) {
-                reject();
+                reject(new Error("" + timeoutValue + "ms timeout exceeded"));
               } else {
                 document.fonts.load(that.getStyle('"' + that["family"] + '"'), testString).then(function (fonts) {
                   if (fonts.length >= 1) {
                     resolve();
                   } else {
                     setTimeout(check, 25);
                   }
-                }, function () {
-                  reject();
-                });
+                }, reject);
               }
             };
             check();
           });
 
           var timer = new Promise(function (resolve, reject) {
-            timeoutId = setTimeout(reject, timeoutValue);
+            timeoutId = setTimeout(function () {
+              reject(new Error("" + timeoutValue + "ms timeout exceeded"));
+            }, timeoutValue);
           });
 
           Promise.race([timer, loader]).then(function () {
             clearTimeout(timeoutId);
             resolve(that);
-          }, function () {
-            reject(that);
-          });
+          }, reject);
         } else {
           onReady(function () {
             var rulerA = new Ruler(testString);
@@ -516,7 +514,7 @@ var FontFaceObserver = function () {
 
               if (now - start >= timeoutValue) {
                 removeContainer();
-                reject(that);
+                reject(new Error("" + timeoutValue + "ms timeout exceeded"));
               } else {
                 var hidden = document["hidden"];
                 if (hidden === true || hidden === undefined) {