handle missing error field

sinonjs · Sep 22, 2021 · 7411b8b · 7411b8b
1 parent 09647ad
commit 7411b8b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/src/fake-timers-src.js b/src/fake-timers-src.js
@@ -207,7 +207,7 @@ function withGlobal(_global) {
     }
 
     /**
-     * @param clock
+     * @param {Clock} clock
      * @param i
      */
     function checkIsNearInfiniteLimit(clock, i) {
@@ -217,7 +217,7 @@ function withGlobal(_global) {
     }
 
     /**
-     * @param clock
+     * @param {Clock} clock
      */
     function resetIsNearInfiniteLimit(clock) {
         clock.isNearInfiniteLimit = false;
@@ -308,14 +308,18 @@ function withGlobal(_global) {
     }
 
     /**
-     * @param clock
+     * @param {Clock} clock
      * @param job
      */
     function getInfiniteLoopError(clock, job) {
         const infiniteLoopError = new Error(
             `Aborting after running ${clock.loopLimit} timers, assuming an infinite loop!`
         );
 
+        if (!job.error) {
+            return infiniteLoopError
+        }
+
         // pattern never matched in Node
         const computedTargetPattern = /target\.*[<|(|[].*?[>|\]|)]\s*/;
         let clockMethodPattern = new RegExp(

diff --git a/test/fake-timers-test.js b/test/fake-timers-test.js
@@ -4944,6 +4944,7 @@ describe("loop limit stack trace", function () {
         });
     });
 
+    // This doesn't really work since we're unable to add an error to all running intervals
     describe("setInterval", function () {
         beforeEach(function () {
             function recursiveCreateTimer() {
@@ -4964,12 +4965,6 @@ describe("loop limit stack trace", function () {
                     assert(catchSpy.calledOnce);
                     const err = catchSpy.firstCall.args[0];
                     assert.equals(err.message, expectedMessage);
-                    assert.equals(
-                        new RegExp(
-                            `Error: ${expectedMessage}\\s+Interval - recursiveCreateTimerTimeout\\s+(at )*recursiveCreateTimer`
-                        ).test(err.stack),
-                        true
-                    );
                 });
         });
 
@@ -4981,12 +4976,6 @@ describe("loop limit stack trace", function () {
             } catch (err) {
                 caughtError = true;
                 assert.equals(err.message, expectedMessage);
-                assert.equals(
-                    new RegExp(
-                        `Error: ${expectedMessage}\\s+Interval - recursiveCreateTimerTimeout\\s+(at )*recursiveCreateTimer`
-                    ).test(err.stack),
-                    true
-                );
             }
             assert.equals(caughtError, true);
         });