dandri/zigbee2mqtt
1
0
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2026-07-02 01:51:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump zigbee-herdsman. https://github.com/Koenkk/zigbee2mqtt/issues/892

Browse Source
This commit is contained in:
Koen Kanters
2019-09-30 21:16:00 +02:00
parent ebd0415945
commit fc3a826f50
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zigbee.js
+1 -1
View File
@@ -73,7 +73,7 @@ class Zigbee extends events.EventEmitter {
// Check if we have to turn off the led
if (settings.get().serial.disable_led) {
this.herdsman.disableLED();
this.herdsman.setLED(false);
}
}
npm-shrinkwrap.json
Generated
+3 -3
View File
@@ -6053,9 +6053,9 @@
}
},
"zigbee-herdsman": {
"version": "0.7.2",
"resolved": "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.7.2.tgz",
"integrity": "sha512-OpZhR6UOR9VIJoEHnsp5JrgYdCIvaSw9D4mCFBf4Q2YfllfnCGAHaA4t7eSYqrIMOLpY3nCYHCDhbB57N5W9oA==",
"version": "0.7.6",
"resolved": "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.7.6.tgz",
"integrity": "sha512-Od4XNGLT6hxkFeibotU1WoopjAGvDc2LUpcly1rER0PA+clKU8WgkYvYkqBTqjfja1Q1s89k3QTgv+365nsxmg==",
"requires": {
"debug": "^4.1.1",
"fast-deep-equal": "^2.0.1",
package.json
+1 -1
View File
@@ -44,7 +44,7 @@
"rimraf": "*",
"semver": "*",
"winston": "*",
"zigbee-herdsman": "0.7.2",
"zigbee-herdsman": "0.7.6",
"zigbee-herdsman-converters": "11.1.14"
},
"devDependencies": {
test/controller.test.js
+4 -3
View File
@@ -33,7 +33,7 @@ describe('Controller', () => {
expect(logger.cleanup).toHaveBeenCalledTimes(1);
expect(zigbeeHerdsman.constructor).toHaveBeenCalledWith({"network":{"panID":6754,"extenedPanID":[221,221,221,221,221,221,221,221],"channelList":[11],"networkKey":[1,3,5,7,9,11,13,15,0,2,4,6,8,10,12,13]},"databasePath":path.join(data.mockDir, "database.db"),"backupPath":path.join(data.mockDir, "coordinator_backup.json"),"serialPort":{"baudRate":115200,"rtscts":true,"path":"/dev/dummy"}});
expect(zigbeeHerdsman.start).toHaveBeenCalledTimes(1);
expect(zigbeeHerdsman.disableLED).toHaveBeenCalledTimes(0);
expect(zigbeeHerdsman.setLED).toHaveBeenCalledTimes(0);
expect(zigbeeHerdsman.permitJoin).toHaveBeenCalledTimes(1);
expect(zigbeeHerdsman.permitJoin).toHaveBeenCalledWith(true);
expect(logger.info).toHaveBeenCalledWith(`Currently ${Object.values(zigbeeHerdsman.devices).length - 1} devices are joined:`)
@@ -169,10 +169,11 @@ describe('Controller', () => {
expect(mockExit).toHaveBeenCalledWith(1);
});
it('Start controller with permit join true', async () => {
it('Start controller with disable_led', async () => {
settings.set(['serial', 'disable_led'], true);
await controller.start();
expect(zigbeeHerdsman.disableLED).toHaveBeenCalledTimes(1);
expect(zigbeeHerdsman.setLED).toHaveBeenCalledTimes(1);
expect(zigbeeHerdsman.setLED).toHaveBeenCalledWith(false);
});
it('Start controller and stop', async () => {
test/stub/zigbeeHerdsman.js
+1 -1
View File
@@ -135,7 +135,7 @@ const mock = {
events[type] = handler;
},
stop: jest.fn(),
disableLED: jest.fn(),
setLED: jest.fn(),
getDevices: jest.fn().mockImplementation(() => {
return Object.values(devices).filter((d) => returnDevices.length === 0 || returnDevices.includes(d.ieeeAddr));
}),