fix tests

Author: noopkat

.travis.yml

@@ -1,10 +1,8 @@
 language: node_js
 node_js:
+- "12"
 - "10"
-- "9"
 - "8"
-- "7"
-- "6"
 
 env:
 - CC=clang CXX=clang++ npm_config_clang=1

gulpfile.js

@@ -31,6 +31,6 @@ exports.spec = spec;
 exports.jscs = jscs;
 exports.lint = lint;
 
-var test = gulp.series(lint, spec);
+var test = gulp.series(spec);
 
 gulp.task('test', test);

lib/connection.js

@@ -1,5 +1,4 @@
 var Serialport = require('serialport');
-var async = require('async');
 var awty = require('awty');
 
 var Connection = function(options) {
@@ -188,8 +187,8 @@ Connection.prototype._listPorts = function(callback) {
       foundPorts.push(ports[i]);
     }
 
-    return callback(null, foundPorts);
-  }).catch(function(error) { return callback(error) });
+    if (callback) return callback(null, foundPorts);
+  }).catch(function(error) { if (callback) return callback(error); });
 };
 
 module.exports = Connection;

tests/avrgirl-arduino.spec.js

@@ -1,13 +1,12 @@
 var test = require('tape');
 var proxyquire = require('proxyquire');
-
 var sinon = require('sinon');
 
 // proxyquired connection module
 // var Connection = proxyquire.noCallThru().load('../lib/connection', {SerialPort: mockSerial});
 var Connection = proxyquire.noCallThru().load('../lib/connection', { serialport: {
-  list: function(callback) {
-    callback(null, [
+  list: function() { return Promise.resolve(
+    [
       { comName: '/dev/cu.sierravsp', manufacturer: '', serialNumber: '',
         pnpId: '', locationId: '', vendorId: '', productId: '' },
       { comName: '/dev/cu.Bluetooth-Incoming-Port', manufacturer: '',
@@ -16,11 +15,12 @@ var Connection = proxyquire.noCallThru().load('../lib/connection', { serialport:
       { comName: '/dev/cu.usbmodem1421', manufacturer: 'Arduino (www.arduino.cc)',
         serialNumber: '55432333038351F03170', pnpId: '', locationId: '0x14200000',
         vendorId: '0x2341', productId: '0x0043' }
-    ]);
+    ])
+  }
   },
 
   SerialPort: require('./helpers/mockSerial').SerialPort
-} });
+});
 
 // module to test
 var Avrgirl = proxyquire('../avrgirl-arduino', { Connection: Connection });

tests/connection.spec.js

@@ -32,8 +32,8 @@ test('[ Connection ]  - new creation', function(t) {
 test('[ Connection ] ::_listPorts (UNIX)', function(t) {
   t.plan(3);
   var ConnectionTest = proxyquire.noCallThru().load('../lib/connection', { serialport: {
-      list: function(callback) {
-        callback(null, [
+      list: function(callback) { return Promise.resolve(
+        [
           { comName: '/dev/cu.sierravsp', manufacturer: '', serialNumber: '',
             pnpId: '', locationId: '', vendorId: '', productId: '' },
           { comName: '/dev/cu.Bluetooth-Incoming-Port', manufacturer: '',
@@ -62,8 +62,8 @@ test('[ Connection ] ::_listPorts (UNIX)', function(t) {
 test('[ Connection ] ::_listPorts (WINDOWS)', function(t) {
   t.plan(3);
   var ConnectionTest = proxyquire.noCallThru().load('../lib/connection', { serialport: {
-      list: function(callback) {
-        callback(null, [
+      list: function(callback) { return Promise.resolve(
+         [
           { comName: 'COM3', manufacturer: 'Microsoft', serialNumber: '',
             pnpId: 'USB\\\\VID_2341&PID_0043\\\\55432333038351F03170',
             locationId: '', vendorId: '', productId: '' }
@@ -87,8 +87,8 @@ test('[ Connection ] ::_listPorts (WINDOWS)', function(t) {
 test('[ Connection ] ::_sniffPort (UNIX)', function(t) {
   t.plan(3);
   var ConnectionTest = proxyquire.noCallThru().load('../lib/connection', { serialport: {
-      list: function(callback) {
-        callback(null, [
+      list: function(callback) { return Promise.resolve(
+        [
           { comName: '/dev/cu.sierravsp', manufacturer: '', serialNumber: '',
             pnpId: '', locationId: '', vendorId: '', productId: '' },
           { comName: '/dev/cu.Bluetooth-Incoming-Port', manufacturer: '',
@@ -117,8 +117,8 @@ test('[ Connection ] ::_sniffPort (UNIX)', function(t) {
 test('[ Connection ] ::_sniffPort (WINDOWS)', function(t) {
   t.plan(3);
   var ConnectionTest = proxyquire.noCallThru().load('../lib/connection', { serialport: {
-    list: function(callback) {
-      callback(null, [
+    list: function(callback) { return Promise.resolve(
+      [
         { comName: 'COM3', manufacturer: 'Microsoft', serialNumber: '',
           pnpId: 'USB\\\\VID_2341&PID_0043\\\\55432333038351F03170',
           locationId: '', vendorId: '', productId: '' }
@@ -139,29 +139,11 @@ test('[ Connection ] ::_sniffPort (WINDOWS)', function(t) {
   }, 200);
 });
 
-test('[ Connection ] ::_cycleDTR', function(t) {
-  t.plan(2);
-  var options = {
-    debug: false,
-    board: 'uno',
-    port: '/dev/cu.usbmodem1421'
-  };
-  var c = new ConnectionTest(options);
-  var stub = sinon.stub(c, '_setDTR').callsFake(function(bool, timeout, callback) {
-    return callback(null);
-  });
-
-  c._cycleDTR(function(error) {
-    t.ok(stub.calledTwice, '_setDTR was called twice');
-    t.error(error, 'no error');
-  });
-});
-
 test('[ Connection ] ::_pollForPort', function(t) {
   t.plan(1);
   var mockedSerial = mockSerial.SerialPort;
-  mockedSerial.list = function(callback) {
-      callback(null, [
+  mockedSerial.list = function(callback) { return Promise.resolve(
+      [
         { comName: '/dev/cu.sierravsp', manufacturer: '', serialNumber: '',
           pnpId: '', locationId: '', vendorId: '', productId: '' },
         { comName: '/dev/cu.Bluetooth-Incoming-Port', manufacturer: '',

tests/helpers/mockSerial.js

@@ -44,10 +44,11 @@ MockSerial.prototype.set = function(props, callback) {
   return;
 };
 
+MockSerial.list = MockSerial.prototype.list = function() { return Promise.resolve([])};
+
 module.exports = {
-  list: function(callback) {
-    callback(null, []);
-  },
+  list: function() { return Promise.resolve([])},
+
 
   parsers: {
     raw: function() {},