Skip to content

Commit 18daae9

Browse files
committed
Replace custom promisify implementation with util.promisify.
1 parent 6d9cbfe commit 18daae9

File tree

1 file changed

+12
-21
lines changed

1 file changed

+12
-21
lines changed

test/markdownlint-test.js

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const fs = require("fs");
66
const os = require("os");
77
const path = require("path");
88
const { URL } = require("url");
9+
const { promisify } = require("util");
910
const md = require("markdown-it")();
1011
const pluginInline = require("markdown-it-for-inline");
1112
const pluginKatex = require("markdown-it-katex");
@@ -26,29 +27,19 @@ const version = packageJson.version;
2627

2728
const deprecatedRuleNames = [ "MD002" ];
2829

29-
function promisify(func, ...args) {
30-
return new Promise((resolve, reject) => {
31-
func(...args, (error, result) => {
32-
if (error) {
33-
return reject(error);
34-
}
35-
return resolve(result);
36-
});
37-
});
38-
}
39-
4030
function createTestForFile(file) {
31+
const markdownlintPromise = promisify(markdownlint);
4132
return function testForFile(test) {
4233
const detailedResults = /[/\\]detailed-results-/.test(file);
4334
test.plan(detailedResults ? 3 : 2);
4435
const resultsFile = file.replace(/\.md$/, ".results.json");
4536
const fixedFile = file.replace(/\.md$/, ".md.fixed");
4637
const configFile = file.replace(/\.md$/, ".json");
4738
let mergedConfig = null;
48-
const actualPromise = promisify(fs.stat, configFile)
39+
const actualPromise = fs.promises.stat(configFile)
4940
.then(
5041
function configFileExists() {
51-
return promisify(fs.readFile, configFile, helpers.utf8Encoding)
42+
return fs.promises.readFile(configFile, helpers.utf8Encoding)
5243
.then(JSON.parse);
5344
},
5445
function noConfigFile() {
@@ -60,7 +51,7 @@ function createTestForFile(file) {
6051
...defaultConfig,
6152
...config
6253
};
63-
return promisify(markdownlint, {
54+
return markdownlintPromise({
6455
"files": [ file ],
6556
"config": mergedConfig,
6657
"resultVersion": detailedResults ? 2 : 3
@@ -70,13 +61,13 @@ function createTestForFile(file) {
7061
function diffFixedFiles(resultVersion2or3) {
7162
return detailedResults ?
7263
Promise.all([
73-
promisify(markdownlint, {
64+
markdownlintPromise({
7465
"files": [ file ],
7566
"config": mergedConfig,
7667
"resultVersion": 3
7768
}),
78-
promisify(fs.readFile, file, helpers.utf8Encoding),
79-
promisify(fs.readFile, fixedFile, helpers.utf8Encoding)
69+
fs.promises.readFile(file, helpers.utf8Encoding),
70+
fs.promises.readFile(fixedFile, helpers.utf8Encoding)
8071
])
8172
.then(function validateApplyFixes(fulfillments) {
8273
const [ resultVersion3, content, expected ] = fulfillments;
@@ -107,7 +98,7 @@ function createTestForFile(file) {
10798
}
10899
);
109100
const expectedPromise = detailedResults ?
110-
promisify(fs.readFile, resultsFile, helpers.utf8Encoding)
101+
fs.promises.readFile(resultsFile, helpers.utf8Encoding)
111102
.then(
112103
function fileContents(contents) {
113104
const errorObjects = JSON.parse(contents);
@@ -119,7 +110,7 @@ function createTestForFile(file) {
119110
});
120111
return errorObjects;
121112
}) :
122-
promisify(fs.readFile, file, helpers.utf8Encoding)
113+
fs.promises.readFile(file, helpers.utf8Encoding)
123114
.then(
124115
function fileContents(contents) {
125116
const lines = contents.split(helpers.newLineRe);
@@ -153,11 +144,11 @@ function createTestForFile(file) {
153144
if (detailedResults) {
154145
return test.ok(true);
155146
}
156-
return promisify(fs.readFile, file, helpers.utf8Encoding)
147+
return fs.promises.readFile(file, helpers.utf8Encoding)
157148
.then(
158149
function applyFixes(content) {
159150
const corrections = helpers.applyFixes(content, errors);
160-
return promisify(markdownlint, {
151+
return markdownlintPromise({
161152
"strings": {
162153
"input": corrections
163154
},

0 commit comments

Comments
 (0)