Skip to content

Commit

Permalink
test_runner: call {before,after}Each() on suites
Browse files Browse the repository at this point in the history
Prior to this commit, beforeEach() and afterEach() hooks were
not called on test suites (describe()). This commit addresses that.

Fixes: nodejs#45028
PR-URL: nodejs#45161
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
cjihrig authored and MoLow committed Nov 23, 2022
1 parent ad15e33 commit 3a6a44f
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
11 changes: 11 additions & 0 deletions lib/internal/test_runner/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -731,13 +731,24 @@ class Suite extends Test {
}

const hookArgs = this.getRunArgs();

if (this.parent?.hooks.beforeEach.length > 0) {
await this.parent[kRunHook]('beforeEach', hookArgs);
}

await this[kRunHook]('before', hookArgs);

const stopPromise = stopTest(this.timeout, this.signal);
const subtests = this.skipped || this.error ? [] : this.subtests;
const promise = SafePromiseAll(subtests, (subtests) => subtests.start());

await SafePromiseRace([promise, stopPromise]);
await this[kRunHook]('after', hookArgs);

if (this.parent?.hooks.afterEach.length > 0) {
await this.parent[kRunHook]('afterEach', hookArgs);
}

this.pass();
} catch (err) {
if (isTestFailureError(err)) {
Expand Down
2 changes: 2 additions & 0 deletions test/message/test_runner_hooks.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ describe('describe hooks', () => {
'before describe hooks',
'beforeEach 1', '1', 'afterEach 1',
'beforeEach 2', '2', 'afterEach 2',
'beforeEach nested',
'before nested',
'beforeEach nested 1', 'nested 1', 'afterEach nested 1',
'beforeEach nested 2', 'nested 2', 'afterEach nested 2',
'after nested',
'afterEach nested',
'after describe hooks',
]);
});
Expand Down
4 changes: 2 additions & 2 deletions test/message/test_runner_test_name_pattern.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ test('top level test enabled', common.mustCall(async (t) => {

describe('top level describe enabled', () => {
before(common.mustCall());
beforeEach(common.mustCall(2));
afterEach(common.mustCall(2));
beforeEach(common.mustCall(4));
afterEach(common.mustCall(4));
after(common.mustCall());

it('nested it disabled', common.mustNotCall());
Expand Down

0 comments on commit 3a6a44f

Please sign in to comment.