@@ -4,24 +4,23 @@ import {mockMQTTPublishAsync} from '../mocks/mqtt';
4
4
import { flushPromises } from '../mocks/utils' ;
5
5
import { devices , events as mockZHEvents } from '../mocks/zigbeeHerdsman' ;
6
6
7
+ import { MockInstance } from 'vitest' ;
8
+
7
9
import * as zhc from 'zigbee-herdsman-converters' ;
8
10
9
11
import { Controller } from '../../lib/controller' ;
10
12
import * as settings from '../../lib/util/settings' ;
11
13
12
- const mockOnEvent = vi . fn ( ) ;
13
- const mockLivoloOnEvent = vi . fn ( ) ;
14
- // @ts -expect-error mock
15
- zhc . onEvent = mockOnEvent ;
16
-
17
- const mocksClear = [ mockMQTTPublishAsync , mockLogger . warning , mockLogger . debug ] ;
14
+ const mockOnEvent = vi . spyOn ( zhc , 'onEvent' ) ;
15
+ const mocksClear = [ mockMQTTPublishAsync , mockLogger . warning , mockLogger . debug , mockOnEvent ] ;
18
16
19
17
describe ( 'Extension: OnEvent' , ( ) => {
20
18
let controller : Controller ;
19
+ let mockLivoloOnEvent : MockInstance ;
21
20
22
21
beforeAll ( async ( ) => {
23
22
const mappedLivolo = ( await zhc . findByDevice ( devices . LIVOLO ) ) ! ;
24
- mappedLivolo . onEvent = mockLivoloOnEvent ;
23
+ mockLivoloOnEvent = vi . spyOn ( mappedLivolo , 'onEvent' ) ;
25
24
} ) ;
26
25
27
26
beforeEach ( async ( ) => {
@@ -39,7 +38,6 @@ describe('Extension: OnEvent', () => {
39
38
data . writeDefaultConfiguration ( ) ;
40
39
settings . reRead ( ) ;
41
40
mocksClear . forEach ( ( m ) => m . mockClear ( ) ) ;
42
- mockOnEvent . mockClear ( ) ;
43
41
} ) ;
44
42
45
43
afterAll ( async ( ) => {
0 commit comments