fix(checks): show skipped instead of passed for stack & mysql checks

no issue
- mark task as skipped instead of completed if the mysql or system stack check fails but the user chooses to ignore the failure

Author: acburdine

lib/commands/doctor/checks/mysql.js

@@ -5,7 +5,7 @@ const includes = require('lodash/includes');
 
 const errors = require('../../../errors');
 
-function mysqlCheck(ctx) {
+function mysqlCheck(ctx, task) {
     // On ubuntu, mysqld is in `/usr/sbin` but it's not automatically in the PATH of non-root users
     // So, we modify the path env var to make things work
     const options = ctx.system.platform.linux ? {env: {PATH: `/usr/sbin:${process.env.PATH}`}} : {};
@@ -23,9 +23,14 @@ ${chalk.blue('c)')} run ${chalk.cyan('`ghost install local`')} to get a developm
             ctx.ui.confirm(chalk.blue('Continue anyway?'), false) :
             Promise.resolve({yes: false});
 
-        return confirmPromise.then(answer => answer.yes || Promise.reject(
-            new errors.SystemError('MySQL check failed.')
-        ));
+        return confirmPromise.then((answer) => {
+            if (answer.yes) {
+                task.skip('MySQL check skipped');
+                return Promise.resolve();
+            }
+
+            return Promise.reject(new errors.SystemError('MySQL check failed.'));
+        });
     });
 }
 

lib/commands/doctor/checks/system-stack.js

@@ -4,7 +4,7 @@ const execa = require('execa');
 
 const errors = require('../../../errors');
 
-function systemStack(ctx) {
+function systemStack(ctx, task) {
     let promise;
 
     if (!ctx.system.platform.linux) {
@@ -35,18 +35,28 @@ function systemStack(ctx) {
         });
     }
 
-    return promise.then(() => { return {yes: true}; }).catch((error) => {
+    return promise.catch((error) => {
         ctx.ui.log(
             `System checks failed with message: '${error.message}'
 Some features of Ghost-CLI may not work without additional configuration.
 For local installs we recommend using \`ghost install local\` instead.`,
             'yellow'
         );
 
-        return ctx.ui.allowPrompt ? ctx.ui.confirm(chalk.blue('Continue anyway?'), false) : Promise.resolve({yes: false});
-    }).then(answer => answer.yes || Promise.reject(
-        new errors.SystemError('System checks failed.')
-    ));
+        return (ctx.ui.allowPrompt ?
+            ctx.ui.confirm(chalk.blue('Continue anyway?'), false) :
+            Promise.resolve({yes: false})
+        ).then((answer) => {
+            if (answer.yes) {
+                task.skip('System stack check skipped');
+                return Promise.resolve();
+            }
+
+            return Promise.reject(
+                new errors.SystemError('System checks failed.')
+            );
+        });
+    });
 }
 
 module.exports = {

test/unit/commands/doctor/checks/mysql-spec.js

@@ -49,17 +49,19 @@ describe('Unit: Doctor Checks > mysql', function () {
         const execaStub = sandbox.stub(execa, 'shell').rejects();
         const logStub = sandbox.stub();
         const confirmStub = sandbox.stub().resolves({yes: true});
+        const skipStub = sandbox.stub();
 
         const ctx = {
             ui: {log: logStub, confirm: confirmStub, allowPrompt: true},
             system: {platform: {linux: true}}
         };
 
-        return mysqlCheck.task(ctx).then(() => {
+        return mysqlCheck.task(ctx, {skip: skipStub}).then(() => {
             expect(execaStub.calledOnce).to.be.true;
             expect(logStub.calledOnce).to.be.true;
             expect(logStub.args[0][0]).to.match(/MySQL install not found/);
             expect(confirmStub.calledOnce).to.be.true;
+            expect(skipStub.calledOnce).to.be.true;
         });
     });
 

test/unit/commands/doctor/checks/system-stack-spec.js

@@ -74,18 +74,20 @@ describe('Unit: Doctor Checks > systemStack', function () {
         const execaStub = sandbox.stub(execa, 'shell').resolves();
         const logStub = sandbox.stub();
         const confirmStub = sandbox.stub().resolves({yes: true});
+        const skipStub = sandbox.stub();
 
         const ctx = {
             ui: {log: logStub, confirm: confirmStub, allowPrompt: true},
             system: {platform: {linux: false}}
         };
 
-        return systemStack.task(ctx).then(() => {
+        return systemStack.task(ctx, {skip: skipStub}).then(() => {
             expect(execaStub.called).to.be.false;
             expect(logStub.calledOnce).to.be.true;
             expect(logStub.args[0][0]).to.match(/failed with message/);
             expect(logStub.args[0][0]).to.match(/not Linux/);
             expect(confirmStub.calledOnce).to.be.true;
+            expect(skipStub.calledOnce).to.be.true;
         });
     });