diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js index ff4161e6..a8c2549d 100644 --- a/lib/extension/homeassistant.js +++ b/lib/extension/homeassistant.js @@ -489,6 +489,7 @@ class HomeAssistant { this.mqtt = mqtt; this.state = state; this.publishDeviceState = publishDeviceState; + this.zigbee2mqttVersion = zigbee2mqttVersion; // A map of all discoverd devices this.discovered = {}; @@ -540,7 +541,7 @@ class HomeAssistant { payload.device = { identifiers: `zigbee2mqtt_${ieeeAddr}`, name: friendlyName, - sw_version: `Zigbee2mqtt ${zigbee2mqttVersion}`, + sw_version: `Zigbee2mqtt ${this.zigbee2mqttVersion}`, model: `${mappedModel.description} (${mappedModel.model})`, manufacturer: mappedModel.vendor, }; diff --git a/test/homeassistant.test.js b/test/homeassistant.test.js index 40c00429..8b50d701 100644 --- a/test/homeassistant.test.js +++ b/test/homeassistant.test.js @@ -17,6 +17,7 @@ describe('HomeAssistant extension', () => { }; homeassistant = new HomeassistantExtension(null, mqtt, null, null); + homeassistant.zigbee2mqttVersion = 'test'; }); afterEach(() => { @@ -56,7 +57,7 @@ describe('HomeAssistant extension', () => { 'device': { 'identifiers': 'zigbee2mqtt_0x12345678', 'name': 'my_device', - 'sw_version': 'Zigbee2mqtt 1.1.0', + 'sw_version': 'Zigbee2mqtt test', 'model': 'Aqara temperature, humidity and pressure sensor (WSDCGQ11LM)', 'manufacturer': 'Xiaomi', }, @@ -80,7 +81,7 @@ describe('HomeAssistant extension', () => { 'device': { 'identifiers': 'zigbee2mqtt_0x12345678', 'name': 'my_device', - 'sw_version': 'Zigbee2mqtt 1.1.0', + 'sw_version': 'Zigbee2mqtt test', 'model': 'Aqara temperature, humidity and pressure sensor (WSDCGQ11LM)', 'manufacturer': 'Xiaomi', }, @@ -104,7 +105,7 @@ describe('HomeAssistant extension', () => { 'device': { 'identifiers': 'zigbee2mqtt_0x12345678', 'name': 'my_device', - 'sw_version': 'Zigbee2mqtt 1.1.0', + 'sw_version': 'Zigbee2mqtt test', 'model': 'Aqara temperature, humidity and pressure sensor (WSDCGQ11LM)', 'manufacturer': 'Xiaomi', }, @@ -128,7 +129,7 @@ describe('HomeAssistant extension', () => { 'device': { 'identifiers': 'zigbee2mqtt_0x12345678', 'name': 'my_device', - 'sw_version': 'Zigbee2mqtt 1.1.0', + 'sw_version': 'Zigbee2mqtt test', 'model': 'Aqara temperature, humidity and pressure sensor (WSDCGQ11LM)', 'manufacturer': 'Xiaomi', }, @@ -167,7 +168,7 @@ describe('HomeAssistant extension', () => { 'device': { 'identifiers': 'zigbee2mqtt_0x12345678', 'name': 'my_device', - 'sw_version': 'Zigbee2mqtt 1.1.0', + 'sw_version': 'Zigbee2mqtt test', 'model': 'Aqara temperature, humidity and pressure sensor (WSDCGQ11LM)', 'manufacturer': 'Xiaomi', }, @@ -191,7 +192,7 @@ describe('HomeAssistant extension', () => { 'device': { 'identifiers': 'zigbee2mqtt_0x12345678', 'name': 'my_device', - 'sw_version': 'Zigbee2mqtt 1.1.0', + 'sw_version': 'Zigbee2mqtt test', 'model': 'Aqara temperature, humidity and pressure sensor (WSDCGQ11LM)', 'manufacturer': 'Xiaomi', }, @@ -215,7 +216,7 @@ describe('HomeAssistant extension', () => { 'device': { 'identifiers': 'zigbee2mqtt_0x12345678', 'name': 'my_device', - 'sw_version': 'Zigbee2mqtt 1.1.0', + 'sw_version': 'Zigbee2mqtt test', 'model': 'Aqara temperature, humidity and pressure sensor (WSDCGQ11LM)', 'manufacturer': 'Xiaomi', }, @@ -239,7 +240,7 @@ describe('HomeAssistant extension', () => { 'device': { 'identifiers': 'zigbee2mqtt_0x12345678', 'name': 'my_device', - 'sw_version': 'Zigbee2mqtt 1.1.0', + 'sw_version': 'Zigbee2mqtt test', 'model': 'Aqara temperature, humidity and pressure sensor (WSDCGQ11LM)', 'manufacturer': 'Xiaomi', },