Merge pull request #72 from brettz9/cli-coverage

Cli coverage

Author: rburns

.eslintrc.json

@@ -5,6 +5,9 @@
     "node": true,
     "mocha": true
   },
+  "parserOptions": {
+    "ecmaVersion": "2018"
+  },
   "extends": "eslint:recommended",
   "rules": {
     "strict": ["error"],

src/cli.js

@@ -21,17 +21,17 @@ const args = {
 let file = null,
     skip = false;
 
+const argv = process.argv.slice(2);
 for (
-    let i = 2, j = 2, ref = process.argv.length;
-    2 <= ref ? j < ref : j > ref;
-    i = 2 <= ref ? ++j : --j
+    let i = 0, len = argv.length;
+    i < len;
+    ++i
 ) {
     if (skip) {
         skip = false;
         continue;
     }
-
-    switch (process.argv[i]) {
+    switch (argv[i]) {
         case '-n':
         case '--newline':
             args.newline = true;
@@ -42,26 +42,28 @@ for (
             break;
         case '-f':
         case '--fg':
-            args.fg = process.argv[i + 1];
+            args.fg = argv[i + 1];
             skip = true;
             break;
         case '-b':
         case '--bg':
-            args.bg = process.argv[i + 1];
+            args.bg = argv[i + 1];
             skip = true;
             break;
         case '-v':
         case '--version':
             console.log(require(__dirname + '/../package.json').version);
             process.exit(0);
+            // istanbul ignore next
             break;
         case '-h':
         case '--help':
             console.log(help);
             process.exit(0);
+            // istanbul ignore next
             break;
         default:
-            file = process.argv[i];
+            file = argv[i];
     }
 }
 

test/cli.js

@@ -3,14 +3,16 @@ const childProcess = require('child_process');
 const {EOL} = require('os');
 const {expect} = require('chai');
 
-function getColorCmd(cmd) {
+function getColorCmd(cmd, args, {shortFlags} = {}) {
+    const flags = Object.entries(args || {}).reduce((s, [flag, value]) => {
+        return s + `${shortFlags ? '-' : '--'}${flag} ${value} `;
+    }, '');
     const cmds = {
-        darwin: `CLICOLOR_FORCE="1" ${cmd} | node lib/cli`,
-        linux: `CLICOLOR="1" ${cmd} | node lib/cli`,
+        darwin: `CLICOLOR_FORCE="1" ${cmd} | node lib/cli ${flags}`,
+        linux: `CLICOLOR="1" ${cmd} | node lib/cli ${flags}`,
         // for win32 compatibility, make sure there is no space between the cmd and the pipe
-        win32: `${cmd}| node lib/cli`
+        win32: `${cmd}| node lib/cli ${flags}`
     };
-
     return cmds[process.platform];
 }
 
@@ -21,25 +23,88 @@ function echo(str) {
     return `echo "${str}"`;
 }
 
-describe('cli', function () {
-    it('converts colors', function (done) {
-        const data = echo('what\u001b[0;31m what?');
-        const result = `what<span style="color:#A00"> what?${EOL}</span>`;
-
-        childProcess.exec(getColorCmd(data), {
+function runCLI (cmd, args) {
+    return new Promise((resolve, reject) => {
+        childProcess.exec(cmd, {
+            ...args,
             timeout: 10000
         }, (err, stdout, stderr) => {
             if (err) {
-                return done(err);
+                return reject(err);
             }
 
             if (stderr) {
-                return done(stderr);
+                return reject(stderr);
             }
 
-            expect(stdout).to.equal(result);
-
-            done();
+            resolve(stdout);
         });
     });
+}
+
+function runColorCLI (data, args, opts) {
+    return runCLI(getColorCmd(data, args, opts));
+}
+
+describe('cli', function () {
+    it('converts colors', async function () {
+        const data = echo('what\u001b[0;31m what?');
+        const result = `what<span style="color:#A00"> what?${EOL}</span>`;
+
+        const stdout = await runColorCLI(data);
+        expect(stdout).to.equal(result);
+    });
+
+    it('works with flags', async function () {
+        const data = echo('test\ntest\n');
+        // Has an additional line break relative to programmatic, due to `echo`
+        const result = 'test<br/>test<br/><br/>';
+
+        const stdout = await runColorCLI(data, {newline: ''});
+        expect(stdout).to.equal(result);
+    });
+
+    it('works with multiple flags', async function () {
+        const data = echo('test\n<test\n');
+        // Has an additional line break relative to programmatic, due to `echo`
+        const result = 'test<br/>&lt;test<br/><br/>';
+
+        let stdout = await runColorCLI(
+            data, {
+                newline: '', escapeXML: '', fg: '"#FAF"', bg: '"#0F0"'
+            }
+        );
+        expect(stdout).to.equal(result);
+        stdout = await runColorCLI(
+            data, {
+                n: '', x: '', f: '"#FAF"', b: '"#0F0"'
+            },
+            {shortFlags: true}
+        );
+        expect(stdout).to.equal(result);
+    });
+
+    it('prints version', async function () {
+        const result = '0.6.14\n';
+        let stdout = await runCLI('node lib/cli --version');
+        expect(stdout).to.equal(result);
+        stdout = await runCLI('node lib/cli -v');
+        expect(stdout).to.equal(result);
+    });
+
+    it('prints help', async function () {
+        const result = 'ansi-to-html [options] [file]';
+        let stdout = await runCLI('node lib/cli --help');
+        expect(stdout).to.contain(result);
+        stdout = await runCLI('node lib/cli -h');
+        expect(stdout).to.contain(result);
+    });
+
+    it('works with a file', async function () {
+        // Has an additional line break relative to programmatic, due to `echo`
+        const result = 'test\ntest\n';
+
+        const stdout = await runCLI('node lib/cli test/fixtures/data.txt');
+        expect(stdout).to.equal(result);
+    });
 });

test/fixtures/data.txt

@@ -0,0 +1,2 @@
+test
+test