Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ignore): Fix external converter loading #25063

Merged
merged 3 commits into from
Dec 5, 2024
Merged

fix(ignore): Fix external converter loading #25063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
419e241
fix(ignore): Fix external converter loading
Koenkk Dec 4, 2024
1707d36
remove assert
Koenkk Dec 4, 2024
809e2b6
cleanup
Koenkk Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ export class Controller {
];

this.extensions = [
new ExtensionExternalConverters(...this.extensionArgs),
new ExtensionOnEvent(...this.extensionArgs),
new ExtensionBridge(...this.extensionArgs),
new ExtensionPublish(...this.extensionArgs),
Expand All @@ -107,7 +108,6 @@ export class Controller {
new ExtensionBind(...this.extensionArgs),
new ExtensionOTAUpdate(...this.extensionArgs),
new ExtensionExternalExtensions(...this.extensionArgs),
new ExtensionExternalConverters(...this.extensionArgs),
new ExtensionAvailability(...this.extensionArgs),
];

Expand Down
17 changes: 16 additions & 1 deletion test/extensions/externalConverters.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ describe('Extension: ExternalConverters', () => {
data.writeDefaultConfiguration();
data.writeDefaultState();
settings.reRead();
returnDevices.push(devices.external_converter_device.ieeeAddr);
returnDevices.push(devices.external_converter_device.ieeeAddr, devices.coordinator.ieeeAddr);

controller = new Controller(jest.fn(), jest.fn());
});
Expand Down Expand Up @@ -147,6 +147,21 @@ describe('Extension: ExternalConverters', () => {
description: 'external',
}),
);

const bridgeDevices = mockMQTT.publishAsync.mock.calls.filter((c) => c[0] === 'zigbee2mqtt/bridge/devices');
expect(bridgeDevices.length).toBe(1);
expect(JSON.parse(bridgeDevices[0][1])).toEqual(
expect.arrayContaining([
expect.objectContaining({
model_id: 'external_converter_device',
supported: true,
definition: expect.objectContaining({
description: 'external',
model: 'external_converter_device',
}),
}),
]),
);
});

it('saves and removes from MQTT', async () => {
Expand Down
Loading