Refactor tryTest: pull toCommit() defn from promise

Author: qlonik

lib/test.js

@@ -59,13 +59,34 @@ function tryTest(fn) {
 		args.push(arguments[i]);
 	}
 
+	let commitCalled = false;
+	let discarded = false;
+	let finished = false;
+
+	const commitFn = (ret, toCommit) => {
+		if (commitCalled) {
+			this.saveFirstError(new Error('Either commit() or discard() was already called'));
+			return;
+		}
+		commitCalled = true;
+
+		if (ret.passed) {
+			this.countFinishedAttemptAssertion(toCommit);
+		} else {
+			this.countFailedAttemptAssertion(ret.error, toCommit);
+		}
+
+		if (toCommit) {
+			for (const log of ret.logs) {
+				this.addLog(log);
+			}
+		}
+	};
+
 	const running = this
 		.forAttempt(t => fn.apply(null, [t].concat(args)))
 		.run();
 
-	let commitCalled = false;
-	let discarded = false;
-
 	this.addPendingAttemptAssertion(running.then(ret => {
 		if (!discarded && !ret.passed) {
 			throw ret.error;
@@ -77,29 +98,10 @@ function tryTest(fn) {
 			return null;
 		}
 
-		const commitFn = toCommit => {
-			if (commitCalled) {
-				this.saveFirstError(new Error('Either commit() or discard() was already called'));
-				return;
-			}
-			commitCalled = true;
-
-			if (ret.passed) {
-				this.countFinishedAttemptAssertion(toCommit);
-			} else {
-				this.countFailedAttemptAssertion(ret.error, toCommit);
-			}
-
-			if (toCommit) {
-				for (const log of ret.logs) {
-					this.addLog(log);
-				}
-			}
-		};
-
+		finished = true;
 		return Object.assign({}, ret, {
-			commit: () => commitFn(true),
-			discard: () => commitFn(false)
+			commit: () => commitFn(ret, true),
+			discard: () => commitFn(ret, false)
 		});
 	});