Remove now unnecessary finishPromised() from lib/test.js

Author: ulken

Diff for: lib/test.js

@@ -525,12 +525,12 @@ class Test {
 	waitForPendingThrowsAssertion() {
 		return new Promise(resolve => {
 			this.finishDueToAttributedError = () => {
-				resolve(this.finishPromised());
+				resolve(this.finish());
 			};
 
 			this.finishDueToInactivity = () => {
 				this.detectImproperThrows();
-				resolve(this.finishPromised());
+				resolve(this.finish());
 			};
 
 			// Wait up to a second to see if an error can be attributed to the
@@ -575,7 +575,7 @@ class Test {
 				}));
 			}
 
-			return this.finishPromised();
+			return this.finish();
 		}
 
 		const returnedObservable = result.retval !== null && typeof result.retval === 'object' && typeof result.retval.subscribe === 'function';
@@ -598,49 +598,49 @@ class Test {
 			if (returnedObservable || returnedPromise) {
 				const asyncType = returnedObservable ? 'observables' : 'promises';
 				this.saveFirstError(new Error(`Do not return ${asyncType} from tests declared via \`test.cb(…)\`. Use \`test.cb(…)\` for legacy callback APIs. When using promises, observables or async functions, use \`test(…)\`.`));
-				return this.finishPromised();
+				return this.finish();
 			}
 
 			if (this.calledEnd) {
-				return this.finishPromised();
+				return this.finish();
 			}
 
 			return new Promise(resolve => {
 				this.endCallbackFinisher = () => {
-					resolve(this.finishPromised());
+					resolve(this.finish());
 				};
 
 				this.finishDueToAttributedError = () => {
-					resolve(this.finishPromised());
+					resolve(this.finish());
 				};
 
 				this.finishDueToTimeout = () => {
-					resolve(this.finishPromised());
+					resolve(this.finish());
 				};
 
 				this.finishDueToInactivity = () => {
 					this.saveFirstError(new Error('`t.end()` was never called'));
-					resolve(this.finishPromised());
+					resolve(this.finish());
 				};
 			});
 		}
 
 		if (promise) {
 			return new Promise(resolve => {
 				this.finishDueToAttributedError = () => {
-					resolve(this.finishPromised());
+					resolve(this.finish());
 				};
 
 				this.finishDueToTimeout = () => {
-					resolve(this.finishPromised());
+					resolve(this.finish());
 				};
 
 				this.finishDueToInactivity = () => {
 					const error = returnedObservable ?
 						new Error('Observable returned by test never completed') :
 						new Error('Promise returned by test never resolved');
 					this.saveFirstError(error);
-					resolve(this.finishPromised());
+					resolve(this.finish());
 				};
 
 				promise
@@ -653,14 +653,14 @@ class Test {
 							}));
 						}
 					})
-					.then(() => resolve(this.finishPromised())); // eslint-disable-line promise/prefer-await-to-then
+					.then(() => resolve(this.finish())); // eslint-disable-line promise/prefer-await-to-then
 			});
 		}
 
-		return this.finishPromised();
+		return this.finish();
 	}
 
-	finish() {
+	async finish() {
 		this.finishing = true;
 
 		if (!this.assertError && this.pendingThrowsAssertion) {
@@ -698,12 +698,6 @@ class Test {
 			title: this.title
 		};
 	}
-
-	finishPromised() {
-		return new Promise(resolve => {
-			resolve(this.finish());
-		});
-	}
 }
 
 module.exports = Test;