Merge pull request #26 from trs/test-updates

Test updates
QuorumDMS · Jun 16, 2017 · 63777c0 · 63777c0
2 parents 3c533a5 + 9be8ffa
commit 63777c0
Show file tree

Hide file tree

Showing 39 changed files with 585 additions and 563 deletions.
diff --git a/src/connector/passive.js b/src/connector/passive.js
@@ -89,7 +89,8 @@ class Passive extends Connector {
         this.server.options.pasv_range.split('-').map(v => v ? parseInt(v) : v) :
         [this.server.options.pasv_range];
       return findPort(min, max);
-    } else return undefined;
+    }
+    throw new errors.ConnectorError('Invalid pasv_range');
   }
 
 }

diff --git a/src/index.js b/src/index.js
@@ -95,7 +95,7 @@ class FtpServer {
 
   setupTLS(_tls) {
     if (!tls) return false;
-    return _.assign(_tls, {
+    return _.assign({}, _tls, {
       cert: _tls.cert ? fs.readFileSync(_tls.cert) : undefined,
       key: _tls.key ? fs.readFileSync(_tls.key) : undefined,
       ca: _tls.ca ? Array.isArray(_tls.ca) ? _tls.ca.map(_ca => fs.readFileSync(_ca)) : [fs.readFileSync(_tls.ca)] : undefined

diff --git a/test/commands/registration/abor.spec.js b/test/commands/registration/abor.spec.js
@@ -25,29 +25,25 @@ describe(CMD, function () {
     sandbox.restore();
   });
 
-  it('// successful | no active connection', done => {
+  it('// successful | no active connection', () => {
     mockClient.connector.waitForConnection.restore();
     sandbox.stub(mockClient.connector, 'waitForConnection').rejects();
 
-    cmdFn()
+    return cmdFn()
     .then(() => {
       expect(mockClient.connector.waitForConnection.callCount).to.equal(1);
       expect(mockClient.connector.end.callCount).to.equal(0);
       expect(mockClient.reply.args[0][0]).to.equal(226);
-      done();
-    })
-    .catch(done);
+    });
   });
 
-  it('// successful | active connection', done => {
-    cmdFn()
+  it('// successful | active connection', () => {
+    return cmdFn()
     .then(() => {
       expect(mockClient.connector.waitForConnection.callCount).to.equal(1);
       expect(mockClient.connector.end.callCount).to.equal(1);
       expect(mockClient.reply.args[0][0]).to.equal(426);
       expect(mockClient.reply.args[1][0]).to.equal(226);
-      done();
-    })
-    .catch(done);
+    });
   });
 });
diff --git a/test/commands/registration/allo.spec.js b/test/commands/registration/allo.spec.js
@@ -19,12 +19,10 @@ describe(CMD, function () {
     sandbox.restore();
   });
 
-  it('// successful', done => {
-    cmdFn()
+  it('// successful', () => {
+    return cmdFn()
     .then(() => {
       expect(mockClient.reply.args[0][0]).to.equal(202);
-      done();
-    })
-    .catch(done);
+    });
   });
 });
diff --git a/test/commands/registration/auth.spec.js b/test/commands/registration/auth.spec.js
@@ -22,31 +22,25 @@ describe(CMD, function () {
     sandbox.restore();
   });
 
-  it('TLS // supported', done => {
-    cmdFn({command: { arg: 'TLS', directive: CMD}})
+  it('TLS // supported', () => {
+    return cmdFn({command: { arg: 'TLS', directive: CMD}})
     .then(() => {
       expect(mockClient.reply.args[0][0]).to.equal(234);
       expect(mockClient.secure).to.equal(true);
-      done();
-    })
-    .catch(done);
+    });
   });
 
-  it('SSL // not supported', done => {
-    cmdFn({command: { arg: 'SSL', directive: CMD}})
+  it('SSL // not supported', () => {
+    return cmdFn({command: { arg: 'SSL', directive: CMD}})
     .then(() => {
       expect(mockClient.reply.args[0][0]).to.equal(504);
-      done();
-    })
-    .catch(done);
+    });
   });
 
-  it('bad // bad', done => {
-    cmdFn({command: { arg: 'bad', directive: CMD}})
+  it('bad // bad', () => {
+    return cmdFn({command: { arg: 'bad', directive: CMD}})
     .then(() => {
       expect(mockClient.reply.args[0][0]).to.equal(504);
-      done();
-    })
-    .catch(done);
+    });
   });
 });
diff --git a/test/commands/registration/cdup.spec.js b/test/commands/registration/cdup.spec.js
@@ -25,13 +25,11 @@ describe(CMD, function () {
     sandbox.restore();
   });
 
-  it('.. // successful', done => {
-    cmdFn({log, command: {directive: CMD}})
+  it('.. // successful', () => {
+    return cmdFn({log, command: {directive: CMD}})
     .then(() => {
       expect(mockClient.reply.args[0][0]).to.equal(250);
       expect(mockClient.fs.chdir.args[0][0]).to.equal('..');
-      done();
-    })
-    .catch(done);
+    });
   });
 });
diff --git a/test/commands/registration/cwd.spec.js b/test/commands/registration/cwd.spec.js
@@ -23,63 +23,56 @@ describe(CMD, function () {
   });
 
   describe('// check', function () {
-    it('fails on no fs', done => {
+    it('fails on no fs', () => {
       const badMockClient = { reply: () => {} };
       const badCmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(badMockClient);
       sandbox.stub(badMockClient, 'reply').resolves();
-      badCmdFn()
+
+      return badCmdFn()
       .then(() => {
         expect(badMockClient.reply.args[0][0]).to.equal(550);
-        done();
-      })
-      .catch(done);
+      });
     });
 
-    it('fails on no fs chdir command', done => {
+    it('fails on no fs chdir command', () => {
       const badMockClient = { reply: () => {}, fs: {} };
       const badCmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(badMockClient);
       sandbox.stub(badMockClient, 'reply').resolves();
-      badCmdFn()
+
+      return badCmdFn()
       .then(() => {
         expect(badMockClient.reply.args[0][0]).to.equal(402);
-        done();
-      })
-      .catch(done);
+      });
     });
   });
 
-  it('test // successful', done => {
-    cmdFn({log, command: { arg: 'test', directive: CMD}})
+  it('test // successful', () => {
+    return cmdFn({log, command: { arg: 'test', directive: CMD}})
     .then(() => {
       expect(mockClient.reply.args[0][0]).to.equal(250);
       expect(mockClient.fs.chdir.args[0][0]).to.equal('test');
-      done();
-    })
-    .catch(done);
+    });
   });
 
-  it('test // successful', done => {
+  it('test // successful', () => {
     mockClient.fs.chdir.restore();
     sandbox.stub(mockClient.fs, 'chdir').resolves('/test');
-    cmdFn({log, command: { arg: 'test', directive: CMD}})
+
+    return cmdFn({log, command: { arg: 'test', directive: CMD}})
     .then(() => {
       expect(mockClient.reply.args[0][0]).to.equal(250);
       expect(mockClient.fs.chdir.args[0][0]).to.equal('test');
-      done();
-    })
-    .catch(done);
+    });
   });
 
-  it('bad // unsuccessful', done => {
+  it('bad // unsuccessful', () => {
     mockClient.fs.chdir.restore();
     sandbox.stub(mockClient.fs, 'chdir').rejects(new Error('Bad'));
 
-    cmdFn({log, command: { arg: 'bad', directive: CMD}})
+    return cmdFn({log, command: { arg: 'bad', directive: CMD}})
     .then(() => {
       expect(mockClient.reply.args[0][0]).to.equal(550);
       expect(mockClient.fs.chdir.args[0][0]).to.equal('bad');
-      done();
-    })
-    .catch(done);
+    });
   });
 });
diff --git a/test/commands/registration/dele.spec.js b/test/commands/registration/dele.spec.js
@@ -23,51 +23,45 @@ describe(CMD, function () {
   });
 
   describe('// check', function () {
-    it('fails on no fs', done => {
+    it('fails on no fs', () => {
       const badMockClient = { reply: () => {} };
       const badCmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(badMockClient);
       sandbox.stub(badMockClient, 'reply').resolves();
-      badCmdFn()
+
+      return badCmdFn()
       .then(() => {
         expect(badMockClient.reply.args[0][0]).to.equal(550);
-        done();
-      })
-      .catch(done);
+      });
     });
 
-    it('fails on no fs delete command', done => {
+    it('fails on no fs delete command', () => {
       const badMockClient = { reply: () => {}, fs: {} };
       const badCmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(badMockClient);
       sandbox.stub(badMockClient, 'reply').resolves();
-      badCmdFn()
+
+      return badCmdFn()
       .then(() => {
         expect(badMockClient.reply.args[0][0]).to.equal(402);
-        done();
-      })
-      .catch(done);
+      });
     });
   });
 
-  it('test // successful', done => {
-    cmdFn({log, command: { arg: 'test', directive: CMD}})
+  it('test // successful', () => {
+    return cmdFn({log, command: { arg: 'test', directive: CMD}})
     .then(() => {
       expect(mockClient.reply.args[0][0]).to.equal(250);
       expect(mockClient.fs.delete.args[0][0]).to.equal('test');
-      done();
-    })
-    .catch(done);
+    });
   });
 
-  it('bad // unsuccessful', done => {
+  it('bad // unsuccessful', () => {
     mockClient.fs.delete.restore();
     sandbox.stub(mockClient.fs, 'delete').rejects(new Error('Bad'));
 
-    cmdFn({log, command: { arg: 'bad', directive: CMD}})
+    return cmdFn({log, command: { arg: 'bad', directive: CMD}})
     .then(() => {
       expect(mockClient.reply.args[0][0]).to.equal(550);
       expect(mockClient.fs.delete.args[0][0]).to.equal('bad');
-      done();
-    })
-    .catch(done);
+    });
   });
 });
diff --git a/test/commands/registration/help.spec.js b/test/commands/registration/help.spec.js
@@ -19,39 +19,31 @@ describe(CMD, function () {
     sandbox.restore();
   });
 
-  it('// successful', done => {
-    cmdFn({command: { directive: CMD }})
+  it('// successful', () => {
+    return cmdFn({command: { directive: CMD }})
     .then(() => {
       expect(mockClient.reply.args[0][0]).to.equal(211);
-      done();
-    })
-    .catch(done);
+    });
   });
 
-  it('help // successful', done => {
-    cmdFn({command: { arg: 'help', directive: CMD}})
+  it('help // successful', () => {
+    return cmdFn({command: { arg: 'help', directive: CMD}})
     .then(() => {
       expect(mockClient.reply.args[0][0]).to.equal(214);
-      done();
-    })
-    .catch(done);
+    });
   });
 
-  it('help // successful', done => {
-    cmdFn({command: { arg: 'allo', directive: CMD}})
+  it('allo // successful', () => {
+    return cmdFn({command: { arg: 'allo', directive: CMD}})
     .then(() => {
       expect(mockClient.reply.args[0][0]).to.equal(214);
-      done();
-    })
-    .catch(done);
+    });
   });
 
-  it('bad // unsuccessful', done => {
-    cmdFn({command: { arg: 'bad', directive: CMD}})
+  it('bad // unsuccessful', () => {
+    return cmdFn({command: { arg: 'bad', directive: CMD}})
     .then(() => {
       expect(mockClient.reply.args[0][0]).to.equal(502);
-      done();
-    })
-    .catch(done);
+    });
   });
 });