mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test: extract defer helper (#24019)

Browse source
This commit is contained in:
Jeremy Rose 2020-06-11 11:35:50 -07:00 committed by GitHub
parent c66282a460
commit 7c7ea141f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
spec-main/index.js
View file

@ -60,6 +60,20 @@ app.whenReady().then(async () => {
}
const mocha = new Mocha(mochaOptions);
// The cleanup method is registered this way rather than through an
// `afterEach` at the top level so that it can run before other `afterEach`
// methods.
//
// The order of events is:
// 1. test completes,
// 2. `defer()`-ed methods run, in reverse order,
// 3. regular `afterEach` hooks run.
const { runCleanupFunctions } = require('./spec-helpers');
mocha.suite.on('suite', function attach (suite) {
suite.afterEach('cleanup', runCleanupFunctions);
suite.on('suite', attach);
});
if (!process.env.MOCHA_REPORTER) {
mocha.ui('bdd').reporter('tap');
}
@ -110,8 +124,4 @@ app.whenReady().then(async () => {
chai.use(require('dirty-chai'));
const runner = mocha.run(cb);
const { runCleanupFunctions } = require('./spec-helpers');
runner.on('test end', () => {
runCleanupFunctions();
});
});

2
spec-main/spec-helpers.ts
View file

@ -19,7 +19,7 @@ export async function runCleanupFunctions () {
}
export function defer (f: CleanupFunction) {
cleanupFunctions.push(f);
cleanupFunctions.unshift(f);
}
class RemoteControlApp {