Support t.timeout(0) to restore default behavior

avajs · Jul 2, 2023 · 5bada71 · 5bada71
1 parent 6767126
commit 5bada71
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/docs/02-execution-context.md b/docs/02-execution-context.md
@@ -45,3 +45,5 @@ You cannot use `t.teardown()` in hooks either.
 ## `t.timeout(ms)`
 
 Set a timeout for the test, in milliseconds. The test will fail if this timeout is exceeded. The timeout is reset each time an assertion is made.
+
+Use `t.timeout(0)` to restore the default behavior.
diff --git a/lib/test.js b/lib/test.js
@@ -289,7 +289,6 @@ export default class Test {
 		this.pendingAttemptCount = 0;
 		this.planCount = null;
 		this.startedAt = 0;
-		this.timeoutMs = 0;
 		this.timeoutTimer = null;
 	}
 
@@ -418,28 +417,21 @@ export default class Test {
 		}
 
 		this.clearTimeout();
-		this.timeoutMs = ms;
-		this.timeoutTimer = nowAndTimers.setCappedTimeout(() => {
-			this.saveFirstError(new Error(message || 'Test timeout exceeded'));
+		if (ms !== 0) {
+			this.timeoutTimer = nowAndTimers.setCappedTimeout(() => {
+				this.saveFirstError(new Error(message || 'Test timeout exceeded'));
 
-			if (this.finishDueToTimeout) {
-				this.finishDueToTimeout();
-			}
-		}, ms);
+				if (this.finishDueToTimeout) {
+					this.finishDueToTimeout();
+				}
+			}, ms);
+		}
 
-		this.notifyTimeoutUpdate(this.timeoutMs);
+		this.notifyTimeoutUpdate(ms);
 	}
 
 	refreshTimeout() {
-		if (!this.timeoutTimer) {
-			return;
-		}
-
-		if (this.timeoutTimer.refresh) {
-			this.timeoutTimer.refresh();
-		} else {
-			this.timeout(this.timeoutMs);
-		}
+		this.timeoutTimer?.refresh();
 	}
 
 	clearTimeout() {