From 3ca35ad72f913316e50c45819e2a1ee50b66d3e1 Mon Sep 17 00:00:00 2001 From: Tommy Goode Date: Thu, 17 Oct 2019 11:36:55 -0500 Subject: [PATCH] Allow a device to be configured even if the interview process fails (#2150) * Allow a device to be configured even if the interview process fails. This fixes #2148. * Adjust failing test to account for new behavior. --- lib/extension/deviceConfigure.js | 2 +- test/deviceConfigure.test.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/extension/deviceConfigure.js b/lib/extension/deviceConfigure.js index 19f436da4..31cdd8bcd 100644 --- a/lib/extension/deviceConfigure.js +++ b/lib/extension/deviceConfigure.js @@ -24,7 +24,7 @@ class DeviceConfigure extends BaseExtension { return false; } - if (device.interviewing === true || device.interviewCompleted === false) { + if (device.interviewing === true) { return false; } diff --git a/test/deviceConfigure.test.js b/test/deviceConfigure.test.js index 778f7e59c..f666dc719 100644 --- a/test/deviceConfigure.test.js +++ b/test/deviceConfigure.test.js @@ -89,7 +89,7 @@ describe('Device receive', () => { device.interviewing = false; }); - it('Should not configure when not interviewCompleted', async () => { + it('Should configure when not interviewCompleted', async () => { const device = zigbeeHerdsman.devices.remote; delete device.meta.configured; device.interviewCompleted = false; @@ -98,7 +98,7 @@ describe('Device receive', () => { const payload = {data: {zclVersion: 1}, cluster: 'genBasic', device, endpoint, type: 'attributeReport', linkquality: 10}; await zigbeeHerdsman.events.message(payload); await flushPromises(); - expectRemoteNotConfigured(); + expectRemoteConfigured(); device.interviewCompleted = true; });