Chore: use async/await in tests

mysticatea · Aug 26, 2017 · 64f6479 · 64f6479
1 parent 66fa8ff
commit 64f6479
Show file tree

Hide file tree

Showing 28 changed files with 955 additions and 1,089 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,5 +1,6 @@
 {
     "presets": ["power-assert"],
+    "plugins": ["transform-async-to-generator"],
     "only": "/test/*.js",
     "sourceMaps": "inline"
 }
diff --git a/bin/common/parse-cli-args.js b/bin/common/parse-cli-args.js
@@ -43,12 +43,12 @@ function createPackageConfig() {
         return retv
     }
 
-    Object.keys(process.env).forEach(key => {
+    for (const key of Object.keys(process.env)) {
         const m = PACKAGE_CONFIG_PATTERN.exec(key)
         if (m != null) {
             overwriteConfig(retv, packageName, m[1], process.env[key])
         }
-    })
+    }
 
     return retv
 }
@@ -62,7 +62,7 @@ function createPackageConfig() {
  */
 function addGroup(groups, initialValues) {
     groups.push(Object.assign(
-        {parallel: false, patterns: []},
+        { parallel: false, patterns: [] },
         initialValues || {}
     ))
 }
@@ -183,7 +183,7 @@ function parseCLIArgsCore(set, args) {    // eslint-disable-line complexity
                 if (set.singleMode) {
                     throw new Error(`Invalid Option: ${arg}`)
                 }
-                addGroup(set.groups, {parallel: true})
+                addGroup(set.groups, { parallel: true })
                 break
 
             case "--npm-path":

diff --git a/bin/run-p/main.js b/bin/run-p/main.js
@@ -28,7 +28,7 @@ const parseCLIArgs = require("../common/parse-cli-args")
 module.exports = function npmRunAll(args, stdout, stderr) {
     try {
         const stdin = process.stdin
-        const argv = parseCLIArgs(args, {parallel: true}, {singleMode: true})
+        const argv = parseCLIArgs(args, { parallel: true }, { singleMode: true })
         const group = argv.lastGroup
 
         if (group.patterns.length === 0) {

diff --git a/bin/run-s/main.js b/bin/run-s/main.js
@@ -28,7 +28,7 @@ const parseCLIArgs = require("../common/parse-cli-args")
 module.exports = function npmRunAll(args, stdout, stderr) {
     try {
         const stdin = process.stdin
-        const argv = parseCLIArgs(args, {parallel: false}, {singleMode: true})
+        const argv = parseCLIArgs(args, { parallel: false }, { singleMode: true })
         const group = argv.lastGroup
 
         if (group.patterns.length === 0) {

diff --git a/lib/create-header.js b/lib/create-header.js
@@ -38,7 +38,7 @@ module.exports = function createHeader(nameAndArgs, packageInfo, isTTY) {
     const packageVersion = packageInfo.body.version
     const scriptBody = packageInfo.body.scripts[name]
     const packagePath = packageInfo.path
-    const color = isTTY ? chalk.styles.gray : {open: "", close: ""}
+    const color = isTTY ? chalk.styles.gray : { open: "", close: "" }
 
     return `
 ${color.open}> ${packageName}@${packageVersion} ${name} ${packagePath}${color.close}

diff --git a/lib/create-prefix-transform-stream.js b/lib/create-prefix-transform-stream.js
@@ -45,11 +45,11 @@ class PrefixTransform extends stream.Transform {
      * Transforms the output chunk.
      *
      * @param {string|Buffer} chunk - A chunk to be transformed.
-     * @param {string} encoding - The encoding of the chunk.
+     * @param {string} _encoding - The encoding of the chunk.
      * @param {function} callback - A callback function that is called when done.
      * @returns {void}
      */
-    _transform(chunk, encoding, callback) {
+    _transform(chunk, _encoding, callback) {
         const prefix = this.prefix
         const nPrefix = `\n${prefix}`
         const state = this.state

diff --git a/lib/index.js b/lib/index.js
@@ -110,15 +110,15 @@ function parsePatterns(patternOrPatterns, args) {
 function toOverwriteOptions(config) {
     const options = []
 
-    Object.keys(config).forEach(packageName => {
+    for (const packageName of Object.keys(config)) {
         const packageConfig = config[packageName]
 
-        Object.keys(packageConfig).forEach(variableName => {
+        for (const variableName of Object.keys(packageConfig)) {
             const value = packageConfig[variableName]
 
             options.push(`--${packageName}:${variableName}=${value}`)
-        })
-    })
+        }
+    }
 
     return options
 }
@@ -249,7 +249,7 @@ module.exports = function npmRunAll(patternOrPatterns, options) {
         return Promise.resolve()
             .then(() => {
                 if (taskList != null) {
-                    return {taskList, packageInfo: null}
+                    return { taskList, packageInfo: null }
                 }
                 return readPackageJson()
             })

diff --git a/lib/match-tasks.js b/lib/match-tasks.js
@@ -17,7 +17,7 @@ const Minimatch = require("minimatch").Minimatch
 //------------------------------------------------------------------------------
 
 const COLON_OR_SLASH = /[:/]/g
-const CONVERT_MAP = {":": "/", "/": ":"}
+const CONVERT_MAP = { ":": "/", "/": ":" }
 
 /**
  * Swaps ":" and "/", in order to use ":" as the separator in minimatch.
@@ -46,7 +46,7 @@ function createFilter(pattern) {
     const matcher = new Minimatch(swapColonAndSlash(task))
     const match = matcher.match.bind(matcher)
 
-    return {match, task, args}
+    return { match, task, args }
 }
 
 /**
@@ -97,18 +97,18 @@ module.exports = function matchTasks(taskList, patterns) {
     const unknownSet = Object.create(null)
 
     // Take tasks while keep the order of patterns.
-    filters.forEach(filter => {
+    for (const filter of filters) {
         let found = false
 
-        candidates.forEach(candidate => {
+        for (const candidate of candidates) {
             if (filter.match(candidate)) {
                 found = true
                 taskSet.add(
                     swapColonAndSlash(candidate) + filter.args,
                     filter.task
                 )
             }
-        })
+        }
 
         // Built-in tasks should be allowed.
         if (!found && (filter.task === "restart" || filter.task === "env")) {
@@ -118,7 +118,7 @@ module.exports = function matchTasks(taskList, patterns) {
         if (!found) {
             unknownSet[filter.task] = true
         }
-    })
+    }
 
     const unknownTasks = Object.keys(unknownSet)
     if (unknownTasks.length > 0) {

diff --git a/lib/read-package-json.js b/lib/read-package-json.js
@@ -26,6 +26,6 @@ module.exports = function readPackageJson() {
     const path = joinPath(process.cwd(), "package.json")
     return readPkg(path).then(body => ({
         taskList: Object.keys(body.scripts || {}),
-        packageInfo: {path, body},
+        packageInfo: { path, body },
     }))
 }
diff --git a/lib/run-task.js b/lib/run-task.js
@@ -33,8 +33,8 @@ const colors = [chalk.cyan, chalk.green, chalk.magenta, chalk.yellow, chalk.red]
 function selectColor(taskName) {
     let hash = 0
 
-    for (const i in taskName) {
-        hash = ((hash << 5) - hash) + taskName.charCodeAt(i)
+    for (const c of taskName) {
+        hash = ((hash << 5) - hash) + c
         hash |= 0
     }
 
@@ -124,7 +124,7 @@ module.exports = function runTask(task, options) {
         const stdinKind = detectStreamKind(stdin, process.stdin)
         const stdoutKind = detectStreamKind(stdout, process.stdout)
         const stderrKind = detectStreamKind(stderr, process.stderr)
-        const spawnOptions = {stdio: [stdinKind, stdoutKind, stderrKind]}
+        const spawnOptions = { stdio: [stdinKind, stdoutKind, stderrKind] }
 
         // Print task name.
         if (options.printName && stdout != null) {
@@ -164,10 +164,10 @@ module.exports = function runTask(task, options) {
             stdin.pipe(cp.stdin)
         }
         if (stdoutKind === "pipe") {
-            cp.stdout.pipe(stdout, {end: false})
+            cp.stdout.pipe(stdout, { end: false })
         }
         if (stderrKind === "pipe") {
-            cp.stderr.pipe(stderr, {end: false})
+            cp.stderr.pipe(stderr, { end: false })
         }
 
         // Register
@@ -177,7 +177,7 @@ module.exports = function runTask(task, options) {
         })
         cp.on("close", (code) => {
             cp = null
-            resolve({task, code})
+            resolve({ task, code })
         })
     })
 

diff --git a/lib/run-tasks.js b/lib/run-tasks.js
@@ -53,8 +53,8 @@ module.exports = function runTasks(tasks, options) {
             return
         }
 
-        const results = tasks.map(task => ({name: task, code: undefined}))
-        const queue = tasks.map((task, index) => ({name: task, index}))
+        const results = tasks.map(task => ({ name: task, code: undefined }))
+        const queue = tasks.map((task, index) => ({ name: task, index }))
         const promises = []
         let error = null
         let aborted = false
@@ -86,7 +86,9 @@ module.exports = function runTasks(tasks, options) {
                 done()
             }
             else {
-                promises.forEach(p => p.abort())
+                for (const p of promises) {
+                    p.abort()
+                }
                 Promise.all(promises).then(done, reject)
             }
         }

diff --git a/lib/spawn-posix.js b/lib/spawn-posix.js
@@ -28,14 +28,14 @@ function kill() {
             return
         }
 
-        descendent.forEach(child => {
+        for (const child of descendent) {
             try {
                 process.kill(child.PID)
             }
             catch (_err) {
                 // ignore.
             }
-        })
+        }
     })
 }
 

diff --git a/package.json b/package.json
@@ -40,11 +40,12 @@
   },
   "devDependencies": {
     "@types/node": "^4.2.20",
+    "babel-plugin-transform-async-to-generator": "^6.24.1",
     "babel-preset-power-assert": "^1.0.0",
     "babel-register": "^6.26.0",
     "codecov": "^2.3.0",
-    "eslint": "^3.12.2",
-    "eslint-config-mysticatea": "^7.0.1",
+    "eslint": "^4.5.0",
+    "eslint-config-mysticatea": "^12.0.0",
     "jsdoc": "^3.5.4",
     "mocha": "^3.5.0",
     "nyc": "^11.1.0",

diff --git a/test/.eslintrc.json b/test/.eslintrc.json
@@ -1,3 +1,8 @@
 {
-    "extends": "mysticatea/mocha"
+    "extends": "mysticatea/mocha",
+    "rules": {
+        "node/no-unsupported-features": ["error", {
+            "ignores": ["asyncAwait"]
+        }]
+    }
 }
diff --git a/test/aggregate-output.js b/test/aggregate-output.js
@@ -54,40 +54,42 @@ describe("[aggregated-output] npm-run-all", () => {
             stdout = new BufferStream()
         })
 
-        it("Node API", () => nodeApi(
-                    ["test-task:delayed first 300", "test-task:delayed second 100", "test-task:delayed third 200"],
-                    {stdout, silent: true, aggregateOutput: true}
-                )
-                .then(() => {
-                    assert.equal(stdout.value, EXPECTED_SERIALIZED_TEXT)
-                }))
+        it("Node API", async () => {
+            await nodeApi(
+                ["test-task:delayed first 300", "test-task:delayed second 100", "test-task:delayed third 200"],
+                { stdout, silent: true, aggregateOutput: true }
+            )
+            assert.equal(stdout.value, EXPECTED_SERIALIZED_TEXT)
+        })
 
-        it("npm-run-all command", () => runAll(
-                    ["test-task:delayed first 300", "test-task:delayed second 100", "test-task:delayed third 200", "--silent", "--aggregate-output"],
-                    stdout
-                )
-                .then(() => {
-                    assert.equal(stdout.value, EXPECTED_SERIALIZED_TEXT)
-                }))
+        it("npm-run-all command", async () => {
+            await runAll(
+                ["test-task:delayed first 300", "test-task:delayed second 100", "test-task:delayed third 200", "--silent", "--aggregate-output"],
+                stdout
+            )
+            assert.equal(stdout.value, EXPECTED_SERIALIZED_TEXT)
+        })
 
-        it("run-s command", () => runSeq(
-                    ["test-task:delayed first 300", "test-task:delayed second 100", "test-task:delayed third 200", "--silent", "--aggregate-output"],
-                    stdout
-                )
-                .then(() => {
-                    assert.equal(stdout.value, EXPECTED_SERIALIZED_TEXT)
-                }))
+        it("run-s command", async () => {
+            await runSeq(
+                ["test-task:delayed first 300", "test-task:delayed second 100", "test-task:delayed third 200", "--silent", "--aggregate-output"],
+                stdout
+            )
+            assert.equal(stdout.value, EXPECTED_SERIALIZED_TEXT)
+        })
 
-        it("run-p command", () => runPar([
-            "test-task:delayed first 3000",
-            "test-task:delayed second 1000",
-            "test-task:delayed third 2000",
-            "--silent", "--aggregate-output"],
-                    stdout
-                )
-                .then(() => {
-                    assert.equal(stdout.value, EXPECTED_PARALLELIZED_TEXT)
-                }))
+        it("run-p command", async () => {
+            await runPar(
+                [
+                    "test-task:delayed first 3000",
+                    "test-task:delayed second 1000",
+                    "test-task:delayed third 2000",
+                    "--silent", "--aggregate-output",
+                ],
+                stdout
+            )
+            assert.equal(stdout.value, EXPECTED_PARALLELIZED_TEXT)
+        })
     })
 })
 
diff --git a/test/argument-placeholders.js b/test/argument-placeholders.js
@@ -67,7 +67,7 @@ describe("[argument-placeholders]", () => {
 
     describe("'{1}' should be replaced by the 1st argument preceded by '--':", () => {
         it("Node API", () =>
-            nodeApi("test-task:dump {1}", {arguments: ["1st", "2nd"]})
+            nodeApi("test-task:dump {1}", { arguments: ["1st", "2nd"] })
                 .then(() => assert(result() === "[\"1st\"]"))
         )
 
@@ -89,7 +89,7 @@ describe("[argument-placeholders]", () => {
 
     describe("'{2}' should be replaced by the 2nd argument preceded by '--':", () => {
         it("Node API", () =>
-            nodeApi("test-task:dump {2}", {arguments: ["1st", "2nd"]})
+            nodeApi("test-task:dump {2}", { arguments: ["1st", "2nd"] })
                 .then(() => assert(result() === "[\"2nd\"]"))
         )
 
@@ -111,7 +111,7 @@ describe("[argument-placeholders]", () => {
 
     describe("'{@}' should be replaced by the every argument preceded by '--':", () => {
         it("Node API", () =>
-            nodeApi("test-task:dump {@}", {arguments: ["1st", "2nd"]})
+            nodeApi("test-task:dump {@}", { arguments: ["1st", "2nd"] })
                 .then(() => assert(result() === "[\"1st\",\"2nd\"]"))
         )
 
@@ -133,7 +133,7 @@ describe("[argument-placeholders]", () => {
 
     describe("'{*}' should be replaced by the all arguments preceded by '--':", () => {
         it("Node API", () =>
-            nodeApi("test-task:dump {*}", {arguments: ["1st", "2nd"]})
+            nodeApi("test-task:dump {*}", { arguments: ["1st", "2nd"] })
                 .then(() => assert(result() === "[\"1st 2nd\"]"))
         )
 
@@ -155,7 +155,7 @@ describe("[argument-placeholders]", () => {
 
     describe("Every '{1}', '{2}', '{@}' and '{*}' should be replaced by the arguments preceded by '--':", () => {
         it("Node API", () =>
-            nodeApi("test-task:dump {1} {2} {3} {@} {*}", {arguments: ["1st", "2nd"]})
+            nodeApi("test-task:dump {1} {2} {3} {@} {*}", { arguments: ["1st", "2nd"] })
                 .then(() => assert(result() === "[\"1st\",\"2nd\",\"1st\",\"2nd\",\"1st 2nd\"]"))
         )