dandri/zigbee2mqtt
1
0
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2026-08-22 10:39:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update zigbee-herdsman-converters to 14.0.525 (#12585)

Browse Source 
* Update zigbee-herdsman-converters to 14.0.525

* Fix tests

* Ignore

Co-authored-by: Koenkk <Koenkk@users.noreply.github.com>
Co-authored-by: Koen Kanters <koenkanters94@gmail.com>
This commit is contained in:
github-actions[bot]
2022-05-24 18:27:17 +00:00
committed by GitHub
co-authored by Koenkk Koen Kanters
parent c6b129c68d
commit f71db6816a
6 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/extension/homeassistant.ts
+6
View File
@@ -1207,10 +1207,12 @@ export default class HomeAssistant extends Extension {
payload.temperature_state_topic = stateTopic;
}
/* istanbul ignore next */
if (payload.temperature_low_state_topic) {
payload.temperature_low_state_topic = stateTopic;
}
/* istanbul ignore next */
if (payload.temperature_high_state_topic) {
payload.temperature_high_state_topic = stateTopic;
}
@@ -1220,20 +1222,24 @@ export default class HomeAssistant extends Extension {
`${baseTopic}/${commandTopicPrefix}set/${payload.temperature_command_topic}`;
}
/* istanbul ignore next */
if (payload.temperature_low_command_topic) {
payload.temperature_low_command_topic =
`${baseTopic}/${commandTopicPrefix}set/${payload.temperature_low_command_topic}`;
}
/* istanbul ignore next */
if (payload.temperature_high_command_topic) {
payload.temperature_high_command_topic =
`${baseTopic}/${commandTopicPrefix}set/${payload.temperature_high_command_topic}`;
}
/* istanbul ignore next */
if (payload.fan_mode_state_topic) {
payload.fan_mode_state_topic = stateTopic;
}
/* istanbul ignore next */
if (payload.fan_mode_command_topic) {
payload.fan_mode_command_topic = `${baseTopic}/${commandTopicPrefix}set/fan_mode`;
}
npm-shrinkwrap.json
Generated
+7 -7
View File
@@ -34,7 +34,7 @@
"winston-transport": "^4.5.0",
"ws": "^8.6.0",
"zigbee-herdsman": "0.14.32",
"zigbee-herdsman-converters": "14.0.522",
"zigbee-herdsman-converters": "14.0.525",
"zigbee2mqtt-frontend": "0.6.95"
},
"bin": {
@@ -9718,9 +9718,9 @@
}
},
"node_modules/zigbee-herdsman-converters": {
"version": "14.0.522",
"resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.522.tgz",
"integrity": "sha512-s/Q6ybCgmFb9+jt2qSYR3GZS00y8tYabE4Fn61/tJIqAzn+fd/HLsD/SRD9gS0IhDyS4J51mpVcIJxx+GiixBg==",
"version": "14.0.525",
"resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.525.tgz",
"integrity": "sha512-v0YqpHVliVDgS32AqxoBLX6R9Er4rAbQo7/6AW0jGmK9s0YqLB8F/3sA7ws48aFHucKXVHTgrxJf3og5POoxVQ==",
"dependencies": {
"axios": "^0.27.2",
"buffer-crc32": "^0.2.13",
@@ -16873,9 +16873,9 @@
}
},
"zigbee-herdsman-converters": {
"version": "14.0.522",
"resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.522.tgz",
"integrity": "sha512-s/Q6ybCgmFb9+jt2qSYR3GZS00y8tYabE4Fn61/tJIqAzn+fd/HLsD/SRD9gS0IhDyS4J51mpVcIJxx+GiixBg==",
"version": "14.0.525",
"resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.525.tgz",
"integrity": "sha512-v0YqpHVliVDgS32AqxoBLX6R9Er4rAbQo7/6AW0jGmK9s0YqLB8F/3sA7ws48aFHucKXVHTgrxJf3og5POoxVQ==",
"requires": {
"axios": "^0.27.2",
"buffer-crc32": "^0.2.13",
package.json
+1 -1
View File
@@ -60,7 +60,7 @@
"winston-transport": "^4.5.0",
"ws": "^8.6.0",
"zigbee-herdsman": "0.14.32",
"zigbee-herdsman-converters": "14.0.522",
"zigbee-herdsman-converters": "14.0.525",
"zigbee2mqtt-frontend": "0.6.95"
},
"devDependencies": {
test/bridge.test.js
+1 -1
View File
File diff suppressed because one or more lines are too long
test/homeassistant.test.js
+6 -6
View File
@@ -1429,21 +1429,21 @@ describe('HomeAssistant extension', () => {
expect(MQTT.publish).toHaveBeenCalledWith(
'zigbee2mqtt/button',
stringify({action: "single", click: "single", battery: null, linkquality: null, voltage: null, power_outage_count: null, temperature: null}),
stringify({action: "single", click: "single", battery: null, linkquality: null, voltage: null, power_outage_count: null, device_temperature: null}),
{ retain: false, qos: 0 },
expect.any(Function),
);
expect(MQTT.publish).toHaveBeenCalledWith(
'zigbee2mqtt/button',
stringify({action: "", battery: null, linkquality: null, voltage: null, click: null, power_outage_count: null, temperature: null}),
stringify({action: "", battery: null, linkquality: null, voltage: null, click: null, power_outage_count: null, device_temperature: null}),
{ retain: false, qos: 0 },
expect.any(Function),
);
expect(MQTT.publish).toHaveBeenCalledWith(
'zigbee2mqtt/button',
stringify({click: "", action: null, battery: null, linkquality: null, voltage: null, power_outage_count: null, temperature: null}),
stringify({click: "", action: null, battery: null, linkquality: null, voltage: null, power_outage_count: null, device_temperature: null}),
{ retain: false, qos: 0 },
expect.any(Function),
);
@@ -1586,7 +1586,7 @@ describe('HomeAssistant extension', () => {
expect(MQTT.publish).toHaveBeenCalledWith(
'zigbee2mqtt/button',
stringify({action: "single", "battery":null,"linkquality":null,"voltage":null, "power_outage_count": null, "temperature": null}),
stringify({action: "single", "battery":null,"linkquality":null,"voltage":null, "power_outage_count": null, "device_temperature": null}),
{ retain: false, qos: 0 },
expect.any(Function),
);
@@ -1623,10 +1623,10 @@ describe('HomeAssistant extension', () => {
await flushPromises();
expect(MQTT.publish).toHaveBeenCalledTimes(4);
expect(MQTT.publish.mock.calls[0][0]).toStrictEqual('zigbee2mqtt/button');
expect(JSON.parse(MQTT.publish.mock.calls[0][1])).toStrictEqual({action: 'single', click: null, battery: null, linkquality: null, voltage: null, power_outage_count: null, temperature: null});
expect(JSON.parse(MQTT.publish.mock.calls[0][1])).toStrictEqual({action: 'single', click: null, battery: null, linkquality: null, voltage: null, power_outage_count: null, device_temperature: null});
expect(MQTT.publish.mock.calls[0][2]).toStrictEqual({"qos": 0, "retain": false});
expect(MQTT.publish.mock.calls[1][0]).toStrictEqual('zigbee2mqtt/button');
expect(JSON.parse(MQTT.publish.mock.calls[1][1])).toStrictEqual({action: '', click: null, battery: null, linkquality: null, voltage: null, power_outage_count: null, temperature: null});
expect(JSON.parse(MQTT.publish.mock.calls[1][1])).toStrictEqual({action: '', click: null, battery: null, linkquality: null, voltage: null, power_outage_count: null, device_temperature: null});
expect(MQTT.publish.mock.calls[1][2]).toStrictEqual({"qos": 0, "retain": false});
expect(MQTT.publish.mock.calls[2][0]).toStrictEqual('homeassistant/device_automation/0x0017880104e45520/action_single/config');
expect(MQTT.publish.mock.calls[3][0]).toStrictEqual('zigbee2mqtt/button/action');
test/receive.test.js
+1 -1
View File
@@ -262,7 +262,7 @@ describe('Receive', () => {
await flushPromises();
expect(MQTT.publish).toHaveBeenCalledTimes(1);
expect(MQTT.publish.mock.calls[0][0]).toStrictEqual('zigbee2mqtt/occupancy_sensor');
expect(JSON.parse(MQTT.publish.mock.calls[0][1])).toStrictEqual({'battery': 100, 'illuminance': 381, "illuminance_lux": 381, 'voltage': 3045, 'temperature': 19});
expect(JSON.parse(MQTT.publish.mock.calls[0][1])).toStrictEqual({'battery': 100, 'illuminance': 381, "illuminance_lux": 381, 'voltage': 3045, 'device_temperature': 19});
expect(MQTT.publish.mock.calls[0][2]).toStrictEqual({"qos": 0, "retain": false});
});