chore(consistancy): remove unnecessary assertions, update get-instanc…

…e function name
TryGhost · Sep 5, 2018 · 593d851 · 593d851
1 parent fca4744
commit 593d851
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/lib/commands/start.js b/lib/commands/start.js
@@ -43,7 +43,7 @@ class StartCommand extends Command {
 
                 const start = () => Promise.resolve(processInstance.start(process.cwd(), this.system.environment))
                     .then(() => {
-                        instance.running(this.system.environment); 
+                        instance.running(this.system.environment);
                     });
 
                 return this.ui.run(start, 'Starting Ghost', runOptions).then(() => {
@@ -89,8 +89,8 @@ class StartCommand extends Command {
 
 StartCommand.global = true;
 StartCommand.description = 'Start an instance of Ghost';
-StartCommand.longDescription = '$0 start [name]\n Starts a known instance of Ghost'
-StartCommand.params = '[name]'
+StartCommand.longDescription = '$0 start [name]\n Starts a known instance of Ghost';
+StartCommand.params = '[name]';
 StartCommand.options = {
     enable: {
         description: '[--no-enable] Enable/don\'t enable the instance to restart on server reboot (if the process manager supports it)',

diff --git a/lib/utils/get-instance.js b/lib/utils/get-instance.js
@@ -3,7 +3,7 @@
 const checkValidInstall = require('./check-valid-install');
 const {SystemError} = require('../errors');
 
-function findInstance(instanceName, system, commandName) {
+function getInstance(instanceName, system, commandName) {
     const instance = system.getInstance(instanceName);
 
     if (instanceName) {
@@ -19,4 +19,4 @@ function findInstance(instanceName, system, commandName) {
     return instance;
 }
 
-module.exports = findInstance;
+module.exports = getInstance;
diff --git a/test/unit/commands/start-spec.js b/test/unit/commands/start-spec.js
@@ -35,7 +35,7 @@ describe('Unit: Commands > Start', function () {
             const stop = new StartCommand();
 
             try {
-                stop.run({}).then(() => {throw new Error('Expected promise rejection')});
+                stop.run({});
                 expect(false, 'An error should have been thrown').to.be.true;
             } catch (error) {
                 expect(error.message).to.equal('YES_IT_DOES');

diff --git a/test/unit/commands/stop-spec.js b/test/unit/commands/stop-spec.js
@@ -41,7 +41,7 @@ describe('Unit: Commands > Stop', function () {
             const stop = new StopCommand();
 
             try {
-                stop.run({}).then(() => { throw new Error('Expected promise rejection') });
+                stop.run({});
                 expect(false, 'An error should have been thrown').to.be.true;
             } catch (error) {
                 expect(error.message).to.equal('YES_IT_DOES');
@@ -50,7 +50,7 @@ describe('Unit: Commands > Stop', function () {
 
         it('stops all if flag is provided', function () {
             const stop = new StopCommand();
-            stop.stopAll = sinon.stub()
+            stop.stopAll = sinon.stub();
             stop.run({all: true});
             expect(stop.stopAll.calledOnce).to.be.true;
         });
@@ -82,7 +82,6 @@ describe('Unit: Commands > Stop', function () {
             myInstance.process = {stop: stopStub};
             myInstance.running = sinon.stub().resolves(true);
 
-
             return stop.run({});
         });
 

diff --git a/test/unit/utils/get-instance-spec.js b/test/unit/utils/get-instance-spec.js
@@ -56,4 +56,4 @@ describe('Unit: Utils > getInstance', function () {
         expect(stubs.chdir.calledOnce).to.to.true;
         expect(stubs.chdir.calledWithExactly(dir)).to.be.true;
     });
-})
+});