fix: Configured PTZ actions should overrule auto-detected actions (not merge with them) (#1558)

* fix: Configured PTZ actions should overrule auto-detected actions (not merge with them)

* Don't populate capabilities unless there is some basis
This commit is contained in:
Dermot Duffy
2024-09-21 18:32:40 -07:00
committed by GitHub
parent 7fd6bc6bee
commit c225a9aeab
6 changed files with 31 additions and 30 deletions
+3 -2
View File
@@ -210,8 +210,9 @@ describe('FrigateCamera', () => {
entityRegistryManager: mock<EntityRegistryManager>(),
stateWatcher: mock<StateWatcher>(),
frigateEventWatcher: mock<FrigateEventWatcher>(),
}),
expect(camera.getCapabilities()?.has('ptz')).toBeFalsy();
});
expect(camera.getCapabilities()?.has('ptz')).toBeFalsy();
expect(camera.getCapabilities()?.hasPTZCapability()).toBeFalsy();
expect(consoleSpy).toBeCalled();
});
+6 -10
View File
@@ -163,11 +163,9 @@ describe('getPTZCapabilitiesFromCameraConfig', () => {
},
}),
),
)?.toEqual(
expect.objectContaining({
[capabilityName]: ['relative'],
}),
);
)?.toEqual({
[capabilityName]: ['relative'],
});
});
});
@@ -182,10 +180,8 @@ describe('getPTZCapabilitiesFromCameraConfig', () => {
},
}),
),
)?.toEqual(
expect.objectContaining({
presets: ['window'],
}),
);
)?.toEqual({
presets: ['window'],
});
});
});
+1 -1
View File
@@ -1,4 +1,4 @@
import { describe, expect, it, vi } from 'vitest';
import { describe, expect, it } from 'vitest';
import { Capabilities } from '../../src/camera-manager/capabilities';
import {
getPTZTarget,