Skip to content

Commit 8319ebc

Browse files
FrederikBoldingFrederikBolding
committed
Fix more tests
1 parent 4ce7730 commit 8319ebc

File tree

5 files changed

+49
-65
lines changed

5 files changed

+49
-65
lines changed

‎packages/snaps-controllers/src/cronjob/CronjobController.test.ts‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ describe('CronjobController', () => {
7171

7272
cronjobController.register(MOCK_SNAP_ID);
7373

74-
expect(rootMessenger.call).toHaveBeenCalledWith(
74+
expect(controllerMessenger.call).toHaveBeenCalledWith(
7575
'PermissionController:getPermissions',
7676
MOCK_SNAP_ID,
7777
);
7878

7979
jest.advanceTimersByTime(inMilliseconds(1, Duration.Minute));
8080

81-
expect(rootMessenger.call).toHaveBeenNthCalledWith(
81+
expect(controllerMessenger.call).toHaveBeenNthCalledWith(
8282
2,
8383
'SnapController:handleRequest',
8484
{
@@ -120,14 +120,14 @@ describe('CronjobController', () => {
120120

121121
cronjobController.register(MOCK_SNAP_ID);
122122

123-
expect(rootMessenger.call).toHaveBeenCalledWith(
123+
expect(controllerMessenger.call).toHaveBeenCalledWith(
124124
'PermissionController:getPermissions',
125125
MOCK_SNAP_ID,
126126
);
127127

128128
jest.advanceTimersByTime(inMilliseconds(1, Duration.Minute));
129129

130-
expect(rootMessenger.call).toHaveBeenNthCalledWith(
130+
expect(controllerMessenger.call).toHaveBeenNthCalledWith(
131131
2,
132132
'SnapController:handleRequest',
133133
{
@@ -161,7 +161,7 @@ describe('CronjobController', () => {
161161

162162
jest.advanceTimersByTime(inMilliseconds(1, Duration.Minute));
163163

164-
expect(rootMessenger.call).not.toHaveBeenCalledWith(
164+
expect(controllerMessenger.call).not.toHaveBeenCalledWith(
165165
'SnapController:handleRequest',
166166
{
167167
snapId: MOCK_SNAP_ID,
@@ -211,7 +211,7 @@ describe('CronjobController', () => {
211211

212212
jest.advanceTimersByTime(inMilliseconds(24, Duration.Hour));
213213

214-
expect(rootMessenger.call).toHaveBeenCalledWith(
214+
expect(controllerMessenger.call).toHaveBeenCalledWith(
215215
'SnapController:handleRequest',
216216
{
217217
snapId: MOCK_SNAP_ID,
@@ -262,7 +262,7 @@ describe('CronjobController', () => {
262262
cronjobController.init();
263263

264264
await new Promise((resolve) => originalProcessNextTick(resolve));
265-
expect(rootMessenger.call).toHaveBeenCalledWith(
265+
expect(controllerMessenger.call).toHaveBeenCalledWith(
266266
'SnapController:handleRequest',
267267
{
268268
snapId: MOCK_SNAP_ID,
@@ -311,13 +311,13 @@ describe('CronjobController', () => {
311311
cronjobController.register(MOCK_SNAP_ID);
312312
jest.runOnlyPendingTimers();
313313

314-
expect(rootMessenger.call).toHaveBeenCalledTimes(1);
315-
expect(rootMessenger.call).toHaveBeenCalledWith(
314+
expect(controllerMessenger.call).toHaveBeenCalledTimes(1);
315+
expect(controllerMessenger.call).toHaveBeenCalledWith(
316316
'PermissionController:getPermissions',
317317
MOCK_SNAP_ID,
318318
);
319319

320-
expect(rootMessenger.call).not.toHaveBeenCalledWith(
320+
expect(controllerMessenger.call).not.toHaveBeenCalledWith(
321321
'SnapController:handleRequest',
322322
{
323323
snapId: MOCK_SNAP_ID,
@@ -359,18 +359,18 @@ describe('CronjobController', () => {
359359
cronjobController.register(MOCK_SNAP_ID);
360360

361361
jest.advanceTimersByTime(inMilliseconds(1, Duration.Day));
362-
expect(rootMessenger.call).toHaveBeenCalledTimes(1);
363-
expect(rootMessenger.call).toHaveBeenCalledWith(
362+
expect(controllerMessenger.call).toHaveBeenCalledTimes(1);
363+
expect(controllerMessenger.call).toHaveBeenCalledWith(
364364
'PermissionController:getPermissions',
365365
MOCK_SNAP_ID,
366366
);
367367

368368
jest.advanceTimersByTime(inMilliseconds(1, Duration.Day));
369-
expect(rootMessenger.call).toHaveBeenCalledTimes(1);
369+
expect(controllerMessenger.call).toHaveBeenCalledTimes(1);
370370

371371
jest.advanceTimersByTime(inMilliseconds(1, Duration.Day));
372-
expect(rootMessenger.call).toHaveBeenCalledTimes(2);
373-
expect(rootMessenger.call).toHaveBeenNthCalledWith(
372+
expect(controllerMessenger.call).toHaveBeenCalledTimes(2);
373+
expect(controllerMessenger.call).toHaveBeenNthCalledWith(
374374
2,
375375
'SnapController:handleRequest',
376376
{
@@ -450,7 +450,7 @@ describe('CronjobController', () => {
450450

451451
jest.advanceTimersByTime(inMilliseconds(1, Duration.Day));
452452

453-
expect(rootMessenger.call).toHaveBeenCalledWith(
453+
expect(controllerMessenger.call).toHaveBeenCalledWith(
454454
'SnapController:handleRequest',
455455
{
456456
snapId: MOCK_SNAP_ID,
@@ -513,7 +513,7 @@ describe('CronjobController', () => {
513513

514514
jest.advanceTimersByTime(inMilliseconds(1, Duration.Minute));
515515

516-
expect(rootMessenger.call).toHaveBeenNthCalledWith(
516+
expect(controllerMessenger.call).toHaveBeenNthCalledWith(
517517
2,
518518
'SnapController:handleRequest',
519519
{
@@ -527,7 +527,7 @@ describe('CronjobController', () => {
527527
},
528528
);
529529

530-
expect(rootMessenger.call).toHaveBeenCalledTimes(2);
530+
expect(controllerMessenger.call).toHaveBeenCalledTimes(2);
531531

532532
cronjobController.destroy();
533533
});
@@ -622,8 +622,8 @@ describe('CronjobController', () => {
622622

623623
jest.advanceTimersByTime(inMilliseconds(1, Duration.Day));
624624

625-
expect(rootMessenger.call).toHaveBeenCalledTimes(3);
626-
expect(rootMessenger.call).toHaveBeenNthCalledWith(
625+
expect(controllerMessenger.call).toHaveBeenCalledTimes(3);
626+
expect(controllerMessenger.call).toHaveBeenNthCalledWith(
627627
2,
628628
'SnapController:handleRequest',
629629
{
@@ -637,7 +637,7 @@ describe('CronjobController', () => {
637637
},
638638
);
639639

640-
expect(rootMessenger.call).toHaveBeenNthCalledWith(
640+
expect(controllerMessenger.call).toHaveBeenNthCalledWith(
641641
3,
642642
'SnapController:handleRequest',
643643
{
@@ -816,8 +816,8 @@ describe('CronjobController', () => {
816816

817817
jest.advanceTimersByTime(inMilliseconds(1, Duration.Day));
818818

819-
expect(rootMessenger.call).toHaveBeenCalledTimes(1);
820-
expect(rootMessenger.call).toHaveBeenCalledWith(
819+
expect(controllerMessenger.call).toHaveBeenCalledTimes(1);
820+
expect(controllerMessenger.call).toHaveBeenCalledWith(
821821
'PermissionController:getPermissions',
822822
MOCK_SNAP_ID,
823823
);
@@ -904,7 +904,7 @@ describe('CronjobController', () => {
904904

905905
jest.advanceTimersByTime(inMilliseconds(1, Duration.Day));
906906

907-
expect(rootMessenger.call).toHaveBeenCalledWith(
907+
expect(controllerMessenger.call).toHaveBeenCalledWith(
908908
'SnapController:handleRequest',
909909
{
910910
snapId: MOCK_SNAP_ID,
@@ -1110,7 +1110,7 @@ describe('CronjobController', () => {
11101110

11111111
jest.advanceTimersByTime(inMilliseconds(1, Duration.Day));
11121112

1113-
expect(rootMessenger.call).toHaveBeenCalledWith(
1113+
expect(controllerMessenger.call).toHaveBeenCalledWith(
11141114
'SnapController:handleRequest',
11151115
{
11161116
snapId: MOCK_SNAP_ID,

‎packages/snaps-controllers/src/snaps/SnapController.test.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2905,7 +2905,7 @@ describe('SnapController', () => {
29052905
},
29062906
});
29072907

2908-
expect(rootMessenger.call).toHaveBeenNthCalledWith(
2908+
expect(messenger.call).toHaveBeenNthCalledWith(
29092909
4,
29102910
'ExecutionService:handleRpcRequest',
29112911
MOCK_SNAP_ID,
@@ -7037,7 +7037,7 @@ describe('SnapController', () => {
70377037

70387038
await new Promise((resolve) => setTimeout(resolve, 10));
70397039

7040-
expect(rootMessenger.call).toHaveBeenNthCalledWith(
7040+
expect(messenger.call).toHaveBeenNthCalledWith(
70417041
6,
70427042
'ExecutionService:handleRpcRequest',
70437043
MOCK_SNAP_ID,
@@ -7103,7 +7103,7 @@ describe('SnapController', () => {
71037103

71047104
await new Promise((resolve) => setTimeout(resolve, 10));
71057105

7106-
expect(rootMessenger.call).toHaveBeenNthCalledWith(
7106+
expect(messenger.call).toHaveBeenNthCalledWith(
71077107
6,
71087108
'ExecutionService:handleRpcRequest',
71097109
MOCK_SNAP_ID,
@@ -11487,7 +11487,7 @@ describe('SnapController', () => {
1148711487

1148811488
// TODO: Either fix this lint violation or explain why it's necessary to
1148911489
// ignore.
11490-
11490+
// eslint-disable-next-line @typescript-eslint/await-thenable
1149111491
await messenger.call('SnapController:clearSnapState', MOCK_SNAP_ID, true);
1149211492

1149311493
jest.advanceTimersByTime(STATE_DEBOUNCE_TIMEOUT);
@@ -11614,7 +11614,7 @@ describe('SnapController', () => {
1161411614

1161511615
// TODO: Either fix this lint violation or explain why it's necessary to
1161611616
// ignore.
11617-
11617+
// eslint-disable-next-line @typescript-eslint/await-thenable
1161811618
const result = await messenger.call(
1161911619
'SnapController:getPermitted',
1162011620
mockSnap.origin,

‎packages/snaps-controllers/src/test-utils/controller.ts‎

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import { SnapCaveatType } from '@metamask/snaps-utils';
2828
import {
2929
MockControllerMessenger,
3030
getPersistedSnapObject,
31-
getTruncatedSnap,
3231
MOCK_LOCAL_SNAP_ID,
3332
MOCK_ORIGIN,
3433
MOCK_SNAP_ID,
@@ -412,10 +411,6 @@ export const getControllerMessenger = (registry = new MockSnapsRegistry()) => {
412411
asyncNoOp,
413412
);
414413
messenger.registerActionHandler('ExecutionService:terminateSnap', asyncNoOp);
415-
messenger.registerActionHandler(
416-
'ExecutionService:terminateAllSnaps',
417-
asyncNoOp,
418-
);
419414

420415
messenger.registerActionHandler(
421416
'SnapsRegistry:get',
@@ -468,7 +463,8 @@ export const getSnapControllerMessenger = (
468463
const snapControllerMessenger = new Messenger<
469464
'SnapController',
470465
SnapControllerActions | AllowedActions,
471-
SnapControllerEvents | AllowedEvents
466+
SnapControllerEvents | AllowedEvents,
467+
any
472468
>({
473469
namespace: 'SnapController',
474470
parent: messenger,
@@ -479,7 +475,6 @@ export const getSnapControllerMessenger = (
479475
'ApprovalController:addRequest',
480476
'ApprovalController:updateRequestState',
481477
'ExecutionService:executeSnap',
482-
'ExecutionService:terminateAllSnaps',
483478
'ExecutionService:terminateSnap',
484479
'ExecutionService:handleRpcRequest',
485480
'NetworkController:getNetworkClientById',
@@ -493,7 +488,6 @@ export const getSnapControllerMessenger = (
493488
'PermissionController:revokePermissionForAllSubjects',
494489
'PermissionController:updateCaveat',
495490
'PermissionController:getSubjectNames',
496-
'PhishingController:testOrigin',
497491
'SelectedNetworkController:getNetworkClientIdForDomain',
498492
'SubjectMetadataController:getSubjectMetadata',
499493
'SubjectMetadataController:addSubjectMetadata',
@@ -665,7 +659,8 @@ export const getRestrictedCronjobControllerMessenger = (
665659
const cronjobControllerMessenger = new Messenger<
666660
'CronjobController',
667661
CronjobControllerActions | AllowedActions,
668-
CronjobControllerEvents | AllowedEvents
662+
CronjobControllerEvents | AllowedEvents,
663+
any
669664
>({
670665
namespace: 'CronjobController',
671666
parent: messenger,
@@ -675,11 +670,7 @@ export const getRestrictedCronjobControllerMessenger = (
675670
actions: [
676671
'PermissionController:hasPermission',
677672
'PermissionController:getPermissions',
678-
'SnapController:getAll',
679673
'SnapController:handleRequest',
680-
'CronjobController:scheduleBackgroundEvent',
681-
'CronjobController:cancelBackgroundEvent',
682-
'CronjobController:getBackgroundEvents',
683674
],
684675
events: [
685676
'SnapController:snapInstalled',
@@ -706,13 +697,11 @@ export const getRestrictedCronjobControllerMessenger = (
706697
},
707698
);
708699

709-
messenger.registerActionHandler('SnapController:getAll', () => {
710-
return [getTruncatedSnap()];
711-
});
712-
713700
messenger.registerActionHandler('SnapController:handleRequest', asyncNoOp);
714701
}
715702

703+
jest.spyOn(cronjobControllerMessenger, 'call');
704+
716705
return cronjobControllerMessenger;
717706
};
718707

@@ -736,7 +725,8 @@ export const getRestrictedSnapsRegistryControllerMessenger = (
736725
return new Messenger<
737726
'SnapsRegistry',
738727
SnapsRegistryActions,
739-
SnapsRegistryEvents
728+
SnapsRegistryEvents,
729+
any
740730
>({ namespace: 'SnapsRegistry', parent: messenger });
741731
};
742732

@@ -761,7 +751,8 @@ export const getRestrictedSnapInterfaceControllerMessenger = (
761751
const snapInterfaceControllerMessenger = new Messenger<
762752
'SnapInterfaceController',
763753
SnapInterfaceControllerAllowedActions,
764-
SnapInterfaceControllerEvents
754+
SnapInterfaceControllerEvents,
755+
any
765756
>({ namespace: 'SnapInterfaceController', parent: messenger });
766757

767758
messenger.delegate({
@@ -861,7 +852,8 @@ export const getRestrictedSnapInsightsControllerMessenger = (
861852
const controllerMessenger = new Messenger<
862853
'SnapInsightsController',
863854
SnapInsightsControllerAllowedActions,
864-
SnapInsightsControllerAllowedEvents
855+
SnapInsightsControllerAllowedEvents,
856+
any
865857
>({
866858
namespace: 'SnapInsightsController',
867859
parent: messenger,
@@ -920,7 +912,9 @@ export const getRestrictedMultichainRouterMessenger = (
920912
) => {
921913
const controllerMessenger = new Messenger<
922914
'MultichainRouter',
923-
MultichainRouterAllowedActions
915+
MultichainRouterAllowedActions,
916+
never,
917+
any
924918
>({ namespace: 'MultichainRouter', parent: messenger });
925919

926920
messenger.delegate({
@@ -956,7 +950,8 @@ export const getRestrictedWebSocketServiceMessenger = (
956950
const controllerMessenger = new Messenger<
957951
'WebSocketService',
958952
WebSocketServiceAllowedActions,
959-
WebSocketServiceEvents
953+
WebSocketServiceEvents,
954+
any
960955
>({ namespace: 'WebSocketService', parent: messenger });
961956

962957
messenger.delegate({

‎packages/snaps-rpc-methods/src/restricted/invokeSnap.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ describe('handleSnapInstall', () => {
147147
const sideEffectMessenger = new Messenger<
148148
'PermissionController',
149149
InstallSnaps | GetPermittedSnaps
150-
>({ namespace: 'PermissionController' });
150+
>({ namespace: 'PermissionController', parent: messenger });
151151

152152
messenger.delegate({
153153
messenger: sideEffectMessenger,
@@ -208,7 +208,7 @@ describe('handleSnapInstall', () => {
208208
const sideEffectMessenger = new Messenger<
209209
'PermissionController',
210210
InstallSnaps | GetPermittedSnaps
211-
>({ namespace: 'PermissionController' });
211+
>({ namespace: 'PermissionController', parent: messenger });
212212

213213
messenger.delegate({
214214
messenger: sideEffectMessenger,

‎packages/snaps-utils/src/test-utils/controller.ts‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,6 @@ export class MockControllerMessenger<
2424
actionType: ActionType,
2525
handler: ActionHandler<Action, ActionType>,
2626
) {
27-
/**
28-
const namespace = actionType.split(":")[0];
29-
const messenger = new Messenger<any, Action, never, any>({ namespace, parent: this });
30-
31-
messenger.registerActionHandler(actionType, handler)*
32-
*/
33-
/**
34-
super.unregisterActionHandler(actionType);
35-
super.registerActionHandler(actionType, handler);*
36-
*/
37-
3827
super._internalUnregisterDelegatedActionHandler(actionType);
3928
super._internalRegisterDelegatedActionHandler(actionType, handler);
4029
}

0 commit comments

Comments
 (0)