Pass test's args to beforeEach/afterEach hooks

Closes avajs#2070

Author: tryzniak

lib/runner.js

@@ -266,13 +266,13 @@ class Runner extends Emittery {
 		return result;
 	}
 
-	async runHooks(tasks, contextRef, titleSuffix) {
+	async runHooks(tasks, contextRef, testArgs = [], titleSuffix) {
 		const hooks = tasks.map(task => new Runnable({
 			contextRef,
 			failWithoutAssertions: false,
 			fn: task.args.length === 0 ?
-				task.implementation :
-				t => task.implementation.apply(null, [t].concat(task.args)),
+				t => task.implementation.apply(null, [t].concat(testArgs)) :
+				t => task.implementation.apply(null, [t].concat(task.args).concat(testArgs)),
 			compareTestSnapshot: this.boundCompareTestSnapshot,
 			updateSnapshots: this.updateSnapshots,
 			metadata: task.metadata,
@@ -303,9 +303,8 @@ class Runner extends Emittery {
 
 	async runTest(task, contextRef) {
 		let hooksAndTestOk = false;
-
 		const hookSuffix = ` for ${task.title}`;
-		if (await this.runHooks(this.tasks.beforeEach, contextRef, hookSuffix)) {
+		if (await this.runHooks(this.tasks.beforeEach, contextRef, task.args, hookSuffix)) {
 			// Only run the test if all `beforeEach` hooks passed.
 			const test = new Runnable({
 				contextRef,
@@ -328,7 +327,7 @@ class Runner extends Emittery {
 					knownFailing: result.metadata.failing,
 					logs: result.logs
 				});
-				hooksAndTestOk = await this.runHooks(this.tasks.afterEach, contextRef, hookSuffix);
+				hooksAndTestOk = await this.runHooks(this.tasks.afterEach, contextRef, task.args, hookSuffix);
 			} else {
 				this.emit('stateChange', {
 					type: 'test-failed',
@@ -342,7 +341,7 @@ class Runner extends Emittery {
 			}
 		}
 
-		const alwaysOk = await this.runHooks(this.tasks.afterEachAlways, contextRef, hookSuffix);
+		const alwaysOk = await this.runHooks(this.tasks.afterEachAlways, contextRef, task.args, hookSuffix);
 		return hooksAndTestOk && alwaysOk;
 	}
 

test/runner.js

@@ -592,6 +592,66 @@ test('macros: Additional args will be spread as additional args on implementatio
 	});
 });
 
+test('Test\'s additional args will be spread and passed down to beforeEach, afterEach implementation functions', t => {
+	t.plan(5);
+
+	return promiseEnd(new Runner(), runner => {
+		runner.on('stateChange', evt => {
+			if (evt.type === 'test-passed') {
+				t.pass();
+			}
+		});
+
+		runner.chain.beforeEach((a, ...rest) => {
+			t.deepEqual(rest, ['foo', 'bar']);
+			a.pass();
+		});
+		runner.chain.afterEach((a, ...rest) => {
+			t.deepEqual(rest, ['foo', 'bar']);
+			a.pass();
+		});
+		runner.chain.afterEach.always((a, ...rest) => {
+			t.deepEqual(rest, ['foo', 'bar']);
+			a.pass();
+		});
+
+		runner.chain('test1', (a, ...rest) => {
+			t.deepEqual(rest, ['foo', 'bar']);
+			a.pass();
+		}, 'foo', 'bar');
+	});
+});
+
+test('Test\'s additional args will be concatenated with args of beforeEach, afterEach args', t => {
+	t.plan(5);
+
+	return promiseEnd(new Runner(), runner => {
+		runner.on('stateChange', evt => {
+			if (evt.type === 'test-passed') {
+				t.pass();
+			}
+		});
+
+		runner.chain.beforeEach((a, ...rest) => {
+			t.deepEqual(rest, ['baz', 'foo', 'bar']);
+			a.pass();
+		}, 'baz');
+		runner.chain.afterEach((a, ...rest) => {
+			t.deepEqual(rest, ['baz', 'foo', 'bar']);
+			a.pass();
+		}, 'baz');
+		runner.chain.afterEach.always((a, ...rest) => {
+			t.deepEqual(rest, ['baz', 'foo', 'bar']);
+			a.pass();
+		}, 'baz');
+
+		runner.chain('test1', (a, ...rest) => {
+			t.deepEqual(rest, ['foo', 'bar']);
+			a.pass();
+		}, 'foo', 'bar');
+	});
+});
+
 test('macros: Customize test names attaching a `title` function', t => {
 	t.plan(6);