test_runner: fix ordering of test hooks

For tests with subtests the before hook was being run after the
beforeEach hook, which is the opposite to test suites and expectations.
Also, a function was being used to close over the after hooks, but at
the point it was being run the after hooks were not yet set up.
Fixes#47915
PR-URL: #47931
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

Author: philnash

lib/internal/test_runner/test.js

@@ -537,12 +537,12 @@ class Test extends AsyncResource {
 });
 
 try{
-if(this.parent?.hooks.beforeEach.length>0){
-awaitthis.parent.runHook('beforeEach',{ args, ctx });
-}
 if(this.parent?.hooks.before.length>0){
 awaitthis.parent.runHook('before',this.parent.getRunArgs());
 }
+if(this.parent?.hooks.beforeEach.length>0){
+awaitthis.parent.runHook('beforeEach',{ args, ctx });
+}
 conststopPromise=stopTest(this.timeout,this.signal);
 construnArgs=ArrayPrototypeSlice(args);
 ArrayPrototypeUnshift(runArgs,this.fn,ctx);
@@ -574,8 +574,8 @@ class Test extends AsyncResource {
 return;
 }
 
-awaitafter();
 awaitafterEach();
+awaitafter();
 this.pass();
 }catch(err){
 try{awaitafter();}catch{/* Ignore error. */}

test/fixtures/test-runner/output/hooks.js

@@ -99,19 +99,24 @@ test('test hooks', async (t) => {
 awaitt.test('2',()=>testArr.push('2'));
 
 awaitt.test('nested',async(t)=>{
+t.before((t)=>testArr.push('nested before '+t.name));
+t.after((t)=>testArr.push('nested after '+t.name));
 t.beforeEach((t)=>testArr.push('nested beforeEach '+t.name));
 t.afterEach((t)=>testArr.push('nested afterEach '+t.name));
 awaitt.test('nested 1',()=>testArr.push('nested1'));
 awaitt.test('nested 2',()=>testArr.push('nested 2'));
 });
 
 assert.deepStrictEqual(testArr,[
-'beforeEach 1','before test hooks','1','afterEach 1',
+'before test hooks',
+'beforeEach 1','1','afterEach 1',
 'beforeEach 2','2','afterEach 2',
 'beforeEach nested',
+'nested before nested',
 'beforeEach nested 1','nested beforeEach nested 1','nested1','afterEach nested 1','nested afterEach nested 1',
 'beforeEach nested 2','nested beforeEach nested 2','nested 2','afterEach nested 2','nested afterEach nested 2',
 'afterEach nested',
+'nested after nested',
 ]);
 });