bluetooth-terminal - npm Package Compare versions

Comparing version 1.2.1 to 1.2.2

BluetoothTerminal.js

@@ -160,3 +160,3 @@ /**
     // Convert data to the string using global object
-    data = String(data);
+    data = String(data || '');
 
@@ -227,3 +227,6 @@ // Return rejected promise immediately if data is empty
         then((characteristic) => this._startNotifications(characteristic)).
-        catch((error) => this._log(error));
+        catch((error) => {
+          this._log(error);
+          return Promise.reject(error);
+        });
   }
@@ -230,0 +233,0 @@

package.json

 {
   "name": "bluetooth-terminal",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "ES6 class for serial communication with Bluetooth Low Energy (Smart) devices",
@@ -25,2 +25,4 @@ "keywords": [
   "devDependencies": {
+    "chai": "^4.1.2",
+    "chai-as-promised": "^7.1.1",
     "coveralls": "^3.0.0",
@@ -30,3 +32,5 @@ "eslint": "^4.12.0",
     "istanbul": "^0.4.5",
-    "mocha": "^4.0.1"
+    "mocha": "^4.0.1",
+    "sinon": "^4.1.2",
+    "web-bluetooth-mock": "^1.0.2"
   },
@@ -33,0 +37,0 @@ "scripts": {

test/BluetoothTerminal.spec.js

@@ -1,7 +0,16 @@
-const assert = require('assert');
+const chai = require('chai');
+const chaiAsPromised = require('chai-as-promised');
 const path = require('path');
+const sinon = require('sinon');
+const {DeviceMock, WebBluetoothMock} = require('web-bluetooth-mock');
 
+chai.use(chaiAsPromised);
+
+const {assert} = chai;
 const BluetoothTerminal = require(path.join(__dirname, '..',
     'BluetoothTerminal'));
 
+global.navigator = global.navigator || {};
+global.TextEncoder = require('util').TextEncoder;
+
 describe('BluetoothTerminal', () => {
@@ -130,3 +139,142 @@ let bt;
 
-  describe('splitByLength', function() {
+  describe('connect', () => {
+    it('should connect', () => {
+      const device = new DeviceMock('Simon', [bt._serviceUuid]);
+      global.navigator.bluetooth = new WebBluetoothMock([device]);
+
+      return assert.isFulfilled(bt.connect());
+    });
+
+    it('should connect the second time to cached device', () => {
+      const device = new DeviceMock('Simon', [bt._serviceUuid]);
+      global.navigator.bluetooth = new WebBluetoothMock([device]);
+
+      const requestDeviceSpy = sinon.spy(global.navigator.bluetooth,
+          'requestDevice');
+
+      return bt.connect().
+          then(() => bt.connect()).
+          then(() => assert(requestDeviceSpy.calledOnce));
+    });
+
+    it('should not connect if device not found', () => {
+      const device = new DeviceMock('Simon', [bt._serviceUuid + 42]);
+      global.navigator.bluetooth = new WebBluetoothMock([device]);
+
+      return assert.isRejected(bt.connect());
+    });
+  });
+
+  describe('disconnect', () => {
+    it('should disconnect once', () => {
+      const device = new DeviceMock('Simon', [bt._serviceUuid]);
+      global.navigator.bluetooth = new WebBluetoothMock([device]);
+
+      const disconnectSpy = sinon.spy(device.gatt, 'disconnect');
+
+      return bt.connect().
+          then(() => {
+            bt.disconnect();
+            bt.disconnect(); // Second call should not fire disconnect method
+            return assert(disconnectSpy.calledOnce);
+          });
+    });
+
+    it('should not call `device.gatt.disconnect` if is already disconnected',
+        () => {
+          const device = new DeviceMock('Simon', [bt._serviceUuid]);
+          global.navigator.bluetooth = new WebBluetoothMock([device]);
+
+          const disconnectSpy = sinon.spy(device.gatt, 'disconnect');
+
+          return bt.connect().
+              then(() => {
+                // Hard mock used here to cover the case
+                bt._device.gatt.connected = false;
+                bt.disconnect();
+                return assert(disconnectSpy.notCalled);
+              });
+        });
+  });
+
+  describe('send', () => {
+    it('should reject empty data', () => {
+      return assert.isRejected(bt.send());
+    });
+
+    it('should reject if not connected', () => {
+      return assert.isRejected(bt.send('Hello, world!'));
+    });
+
+    it('should write to characteristic', () => {
+      const device = new DeviceMock('Simon', [bt._serviceUuid]);
+      global.navigator.bluetooth = new WebBluetoothMock([device]);
+
+      let writeValueSpy;
+
+      return bt.connect().
+          then(() => {
+            writeValueSpy = sinon.spy(bt._characteristic, 'writeValue');
+            return bt.send('Hello, world!');
+          }).
+          then(() => assert(writeValueSpy.calledOnce));
+    });
+
+    it('should write long data to characteristic consistently', () => {
+      const device = new DeviceMock('Simon', [bt._serviceUuid]);
+      global.navigator.bluetooth = new WebBluetoothMock([device]);
+
+      let writeValueSpy;
+      let data = '';
+
+      while (data.length <= bt._maxCharacteristicValueLength) {
+        data += 'Hello, world!';
+      }
+
+      return bt.connect().
+          then(() => {
+            writeValueSpy = sinon.spy(bt._characteristic, 'writeValue');
+            return bt.send(data);
+          }).
+          then(() => assert.strictEqual(writeValueSpy.callCount,
+              Math.ceil(data.length / bt._maxCharacteristicValueLength)));
+    });
+
+    it('should reject if device suddenly disconnects', () => {
+      const device = new DeviceMock('Simon', [bt._serviceUuid]);
+      global.navigator.bluetooth = new WebBluetoothMock([device]);
+
+      let writeValueSpy;
+      let data = '';
+
+      while (data.length <= bt._maxCharacteristicValueLength) {
+        data += 'Hello, world!';
+      }
+
+      return bt.connect().
+          then(() => {
+            writeValueSpy = sinon.spy(bt._characteristic, 'writeValue');
+            bt.send(data);
+            bt.disconnect();
+          }).
+          then(() => assert(writeValueSpy.calledOnce));
+    });
+  });
+
+  describe('getDeviceName', () => {
+    it('should return empty string if not connected', () => {
+      assert.strictEqual(bt.getDeviceName(), '');
+    });
+
+    it('should return device name', () => {
+      const value = 'Simon';
+      const device = new DeviceMock(value, [bt._serviceUuid]);
+      global.navigator.bluetooth = new WebBluetoothMock([device]);
+
+      return bt.connect().
+          then(() => assert.strictEqual(bt.getDeviceName(), value));
+    });
+  });
+
+  describe('_splitByLength', function() {
     it('should split string shorter than specified length to one chunk', () => {
@@ -133,0 +281,0 @@ assert.equal(bt.constructor._splitByLength('abcde', 6).length, 1);

No alert changes

Improved metrics

Total package byte prevSize

33362

increased by17.53%

Lines of code

606

increased by24.69%

Worsened metrics

Dev dependency count

9

increased by80%

No dependency changes