Add t.context support on before hooks

Author: kugtong33

lib/test-collection.js

@@ -165,26 +165,26 @@ class TestCollection extends EventEmitter {
 		return test;
 	}
 
-	_buildTestWithHooks(test) {
+	_buildTestWithHooks(test, context) {
 		if (test.metadata.skipped || test.metadata.todo) {
 			return new Sequence([this._skippedTest(this._buildTest(test))], true);
 		}
 
-		const context = {context: {}};
+		const contextRef = context ? Object.create(context) : {context: {}};
 
-		const beforeHooks = this._buildHooks(this.hooks.beforeEach, test.title, context);
-		const afterHooks = this._buildHooks(this.hooks.afterEach, test.title, context);
+		const beforeHooks = this._buildHooks(this.hooks.beforeEach, test.title, contextRef);
+		const afterHooks = this._buildHooks(this.hooks.afterEach, test.title, contextRef);
 
-		let sequence = new Sequence([].concat(beforeHooks, this._buildTest(test, context), afterHooks), true);
+		let sequence = new Sequence([].concat(beforeHooks, this._buildTest(test, contextRef), afterHooks), true);
 		if (this.hooks.afterEachAlways.length > 0) {
-			const afterAlwaysHooks = new Sequence(this._buildHooks(this.hooks.afterEachAlways, test.title, context));
+			const afterAlwaysHooks = new Sequence(this._buildHooks(this.hooks.afterEachAlways, test.title, contextRef));
 			sequence = new Sequence([sequence, afterAlwaysHooks], false);
 		}
 		return sequence;
 	}
 
-	_buildTests(tests) {
-		return tests.map(test => this._buildTestWithHooks(test));
+	_buildTests(tests, context) {
+		return tests.map(test => this._buildTestWithHooks(test, context));
 	}
 
 	_hasUnskippedTests() {
@@ -195,18 +195,22 @@ class TestCollection extends EventEmitter {
 	}
 
 	build() {
-		const serialTests = new Sequence(this._buildTests(this.tests.serial), this.bail);
-		const concurrentTests = new Concurrent(this._buildTests(this.tests.concurrent), this.bail);
-		const allTests = new Sequence([serialTests, concurrentTests]);
+		const sequenceTests = context => {
+			const serialTests = new Sequence(this._buildTests(this.tests.serial, context), this.bail);
+			const concurrentTests = new Concurrent(this._buildTests(this.tests.concurrent, context), this.bail);
+			return new Sequence([serialTests, concurrentTests]);
+		};
 
 		let finalTests;
 		// Only run before and after hooks when there are unskipped tests
 		if (this._hasUnskippedTests()) {
-			const beforeHooks = new Sequence(this._buildHooks(this.hooks.before));
+			const context = {context: {}};
+
+			const beforeHooks = new Sequence(this._buildHooks(this.hooks.before, null, context));
 			const afterHooks = new Sequence(this._buildHooks(this.hooks.after));
-			finalTests = new Sequence([beforeHooks, allTests, afterHooks], true);
+			finalTests = new Sequence([beforeHooks, sequenceTests(context), afterHooks], true);
 		} else {
-			finalTests = new Sequence([allTests], true);
+			finalTests = new Sequence([sequenceTests()], true);
 		}
 
 		if (this.hooks.afterAlways.length > 0) {

test/hooks.js

@@ -454,26 +454,28 @@ test('shared context', t => {
 	const runner = new Runner();
 
 	runner.chain.before(a => {
-		a.is(a.context, null);
+		a.deepEqual(a.context, {});
+		a.context.arr = ['a'];
 	});
 
 	runner.chain.after(a => {
 		a.is(a.context, null);
 	});
 
 	runner.chain.beforeEach(a => {
-		a.context.arr = ['a'];
+		a.context.arr.push('b');
+		a.deepEqual(a.context.arr, ['a', 'b']);
 	});
 
 	runner.chain.test(a => {
 		a.pass();
-		a.context.arr.push('b');
-		a.deepEqual(a.context.arr, ['a', 'b']);
+		a.context.arr.push('c');
+		a.deepEqual(a.context.arr, ['a', 'b', 'c']);
 	});
 
 	runner.chain.afterEach(a => {
-		a.context.arr.push('c');
-		a.deepEqual(a.context.arr, ['a', 'b', 'c']);
+		a.context.arr.push('d');
+		a.deepEqual(a.context.arr, ['a', 'b', 'c', 'd']);
 	});
 
 	return runner.run({}).then(() => {