Fix zigbee2mqtt.isUsed function (#1673)

GladysAssistant · Dec 16, 2022 · 06d878e · 06d878e
1 parent fefb9cf
commit 06d878e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/server/services/zigbee2mqtt/index.js b/server/services/zigbee2mqtt/index.js
@@ -36,7 +36,7 @@ module.exports = function Zigbee2mqttService(gladys, serviceId) {
    *  const used = await gladys.services.zigbee2mqtt.isUsed();
    */
   async function isUsed() {
-    return zigbee2mqttManager.gladysConnected && zigbee2mqttManager.z2mEnabled;
+    return zigbee2mqttManager.gladysConnected && zigbee2mqttManager.zigbee2mqttConnected;
   }
 
   return Object.freeze({

diff --git a/server/test/services/zigbee2mqtt/index.test.js b/server/test/services/zigbee2mqtt/index.test.js
@@ -5,7 +5,11 @@ const { assert, fake } = sinon;
 
 const Zigbee2MqttService = require('../../../services/zigbee2mqtt');
 
-const gladys = {};
+const gladys = {
+  event: {
+    emit: fake.returns,
+  },
+};
 
 describe('zigbee2mqtt service', () => {
   // PREPARE
@@ -35,8 +39,15 @@ describe('zigbee2mqtt service', () => {
     assert.calledOnce(zigbee2MqttService.device.disconnect);
     assert.notCalled(zigbee2MqttService.device.init);
   });
-  it('should return if service is used', async () => {
+  it('isUsed: should return false, service not used', async () => {
     const used = await zigbee2MqttService.isUsed();
     expect(used).to.equal(false);
   });
+  it('isUsed: should return true, service is used', async () => {
+    zigbee2MqttService.device.gladysConnected = true;
+    // handle one message so that zigbee2mqtt connected is true
+    await zigbee2MqttService.device.handleMqttMessage('zigbee2mqtt/bridge/devices', JSON.stringify([]));
+    const used = await zigbee2MqttService.isUsed();
+    expect(used).to.equal(true);
+  });
 });