Skip to content

Commit d6b97d5

Browse files
Migrate Jake to 10.8.5 (knex#5138)
1 parent b8fc16f commit d6b97d5

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
"eslint-plugin-import": "^2.26.0",
115115
"eslint-plugin-mocha-no-only": "^1.1.1",
116116
"husky": "^7.0.4",
117-
"jake": "^8.1.1",
117+
"jake": "^10.8.5",
118118
"JSONStream": "^1.3.5",
119119
"lint-staged": "^12.3.7",
120120
"mocha": "^9.2.2",

test/jake-util/helpers/migration-test-helper.js

+10-13
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,36 @@
22

33
const os = require('os');
44
const fs = require('fs');
5+
const child_process = require("child_process");
56
const rimrafSync = require('rimraf').sync;
67

78
function assertExec(cmd, desc) {
89
desc = desc || 'Run ' + cmd;
910
return new Promise((resolve, reject) => {
1011
let stderr = '';
1112
let stdout = '';
12-
// console.log(`Executing: ${cmd}`);
13-
const bin = jake.createExec([cmd]);
14-
bin.addListener('error', (msg, code) =>
13+
const bin = child_process.exec(cmd);
14+
bin.on('error', (msg, code) =>
1515
reject(Error(desc + ' FAIL. ' + stderr))
1616
);
17-
bin.addListener('cmdEnd', (cmd) => resolve({ cmd, stdout, stderr }));
18-
bin.addListener('stdout', (data) => (stdout += data.toString()));
19-
bin.addListener('stderr', (data) => (stderr += data.toString()));
20-
bin.run();
17+
bin.on('cmdEnd', (cmd) => resolve({ cmd, stdout, stderr }));
18+
bin.on('stdout', (data) => (stdout += data.toString()));
19+
bin.on('stderr', (data) => (stderr += data.toString()));
2120
});
2221
}
2322

2423
function assertExecError(cmd, desc) {
2524
desc = desc || 'Run ' + cmd;
2625
return new Promise((resolve, reject) => {
2726
let stderr = '';
28-
// console.log(`Executing: ${cmd}`);
29-
const bin = jake.createExec([cmd]);
30-
bin.addListener('error', (msg, code) => {
27+
const bin = child_process.exec(cmd);
28+
bin.on('error', (msg, code) => {
3129
resolve(stderr);
3230
});
33-
bin.addListener('cmdEnd', () => {
31+
bin.on('cmdEnd', () => {
3432
throw new Error('Error was expected, but none thrown');
3533
});
36-
bin.addListener('stderr', (data) => (stderr += data.toString()));
37-
bin.run();
34+
bin.on('stderr', (data) => (stderr += data.toString()));
3835
});
3936
}
4037

0 commit comments

Comments
 (0)