Fix SnapInterfaceController tests

Author: Mrtenz

packages/snaps-controllers/src/interface/SnapInterfaceController.test.tsx

@@ -1,16 +1,17 @@
 import { deriveStateFromMetadata } from '@metamask/base-controller/next';
+import { PhishingDetectorResultType } from '@metamask/phishing-controller';
 import type { SnapId } from '@metamask/snaps-sdk';
 import {
+  ContentType,
   form,
   image,
   input,
   panel,
   text,
-  ContentType,
 } from '@metamask/snaps-sdk';
 import {
-  AssetSelector,
   AccountSelector,
+  AssetSelector,
   Box,
   Field,
   FileInput,
@@ -28,10 +29,10 @@ import { MOCK_SNAP_ID } from '@metamask/snaps-utils/test-utils';
 
 import { SnapInterfaceController } from './SnapInterfaceController';
 import {
-  MOCK_ACCOUNT_ID,
-  MockApprovalController,
   getRestrictedSnapInterfaceControllerMessenger,
   getRootSnapInterfaceControllerMessenger,
+  MOCK_ACCOUNT_ID,
+  MockApprovalController,
 } from '../test-utils';
 
 jest.mock('@metamask/snaps-utils', () => ({
@@ -113,8 +114,8 @@ describe('SnapInterfaceController', () => {
         id,
       );
 
-      expect(rootMessenger.call).toHaveBeenNthCalledWith(
-        2,
+      expect(controllerMessenger.call).toHaveBeenNthCalledWith(
+        1,
         'PhishingController:testOrigin',
         'https://foo.bar/',
       );
@@ -149,8 +150,8 @@ describe('SnapInterfaceController', () => {
         components,
       );
 
-      expect(rootMessenger.call).toHaveBeenNthCalledWith(
-        3,
+      expect(controllerMessenger.call).toHaveBeenNthCalledWith(
+        2,
         'MultichainAssetsController:getState',
       );
 
@@ -204,8 +205,8 @@ describe('SnapInterfaceController', () => {
         id,
       );
 
-      expect(rootMessenger.call).toHaveBeenNthCalledWith(
-        2,
+      expect(controllerMessenger.call).toHaveBeenNthCalledWith(
+        1,
         'PhishingController:testOrigin',
         'https://foo.bar/',
       );
@@ -246,8 +247,8 @@ describe('SnapInterfaceController', () => {
         id,
       );
 
-      expect(rootMessenger.call).toHaveBeenNthCalledWith(
-        2,
+      expect(controllerMessenger.call).toHaveBeenNthCalledWith(
+        1,
         'AccountsController:getSelectedMultichainAccount',
       );
 
@@ -322,13 +323,13 @@ describe('SnapInterfaceController', () => {
         id,
       );
 
-      expect(rootMessenger.call).toHaveBeenNthCalledWith(
-        2,
+      expect(controllerMessenger.call).toHaveBeenNthCalledWith(
+        1,
         'AccountsController:getSelectedMultichainAccount',
       );
 
-      expect(rootMessenger.call).toHaveBeenNthCalledWith(
-        3,
+      expect(controllerMessenger.call).toHaveBeenNthCalledWith(
+        2,
         'AccountsController:listMultichainAccounts',
       );
 
@@ -399,13 +400,13 @@ describe('SnapInterfaceController', () => {
         id,
       );
 
-      expect(rootMessenger.call).toHaveBeenNthCalledWith(
-        2,
+      expect(controllerMessenger.call).toHaveBeenNthCalledWith(
+        1,
         'AccountsController:getSelectedMultichainAccount',
       );
 
-      expect(rootMessenger.call).toHaveBeenNthCalledWith(
-        3,
+      expect(controllerMessenger.call).toHaveBeenNthCalledWith(
+        2,
         'AccountsController:listMultichainAccounts',
       );
 
@@ -532,7 +533,7 @@ describe('SnapInterfaceController', () => {
 
       rootMessenger.registerActionHandler(
         'PhishingController:testOrigin',
-        () => ({ result: true, type: 'all' }),
+        () => ({ result: true, type: PhishingDetectorResultType.All }),
       );
 
       // eslint-disable-next-line no-new
@@ -556,8 +557,8 @@ describe('SnapInterfaceController', () => {
         ),
       ).toThrow('Invalid URL: The specified URL is not allowed.');
 
-      expect(rootMessenger.call).toHaveBeenNthCalledWith(
-        2,
+      expect(controllerMessenger.call).toHaveBeenNthCalledWith(
+        1,
         'PhishingController:testOrigin',
         'https://foo.bar/',
       );
@@ -572,7 +573,7 @@ describe('SnapInterfaceController', () => {
 
       rootMessenger.registerActionHandler(
         'PhishingController:testOrigin',
-        () => ({ result: true, type: 'all' }),
+        () => ({ result: true, type: PhishingDetectorResultType.All }),
       );
 
       // eslint-disable-next-line no-new
@@ -596,8 +597,8 @@ describe('SnapInterfaceController', () => {
         ),
       ).toThrow('Invalid URL: The specified URL is not allowed.');
 
-      expect(rootMessenger.call).toHaveBeenNthCalledWith(
-        2,
+      expect(controllerMessenger.call).toHaveBeenNthCalledWith(
+        1,
         'PhishingController:testOrigin',
         'https://foo.bar/',
       );
@@ -636,8 +637,8 @@ describe('SnapInterfaceController', () => {
         ),
       ).toThrow('Invalid URL: The Snap being navigated to is not installed.');
 
-      expect(rootMessenger.call).toHaveBeenNthCalledWith(
-        2,
+      expect(controllerMessenger.call).toHaveBeenNthCalledWith(
+        1,
         'SnapController:get',
         MOCK_SNAP_ID,
       );
@@ -652,7 +653,7 @@ describe('SnapInterfaceController', () => {
 
       rootMessenger.registerActionHandler(
         'PhishingController:testOrigin',
-        () => ({ result: true, type: 'all' }),
+        () => ({ result: true, type: PhishingDetectorResultType.All }),
       );
 
       rootMessenger.registerActionHandler(
@@ -694,8 +695,8 @@ describe('SnapInterfaceController', () => {
         'Could not find account for address: solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp:7S3P4HxJpyyigGzodYwHtCxZyUQe9JiBMHyRWXArAaKv',
       );
 
-      expect(rootMessenger.call).toHaveBeenNthCalledWith(
-        2,
+      expect(controllerMessenger.call).toHaveBeenNthCalledWith(
+        1,
         'AccountsController:getAccountByAddress',
         '7S3P4HxJpyyigGzodYwHtCxZyUQe9JiBMHyRWXArAaKv',
       );
@@ -1067,7 +1068,7 @@ describe('SnapInterfaceController', () => {
 
       rootMessenger.registerActionHandler(
         'PhishingController:testOrigin',
-        () => ({ result: true, type: 'all' }),
+        () => ({ result: true, type: PhishingDetectorResultType.All }),
       );
 
       // eslint-disable-next-line no-new
@@ -1103,8 +1104,8 @@ describe('SnapInterfaceController', () => {
         ),
       ).toThrow('Invalid URL: The specified URL is not allowed.');
 
-      expect(rootMessenger.call).toHaveBeenNthCalledWith(
-        3,
+      expect(controllerMessenger.call).toHaveBeenNthCalledWith(
+        1,
         'PhishingController:testOrigin',
         'https://foo.bar/',
       );
@@ -1119,7 +1120,7 @@ describe('SnapInterfaceController', () => {
 
       rootMessenger.registerActionHandler(
         'PhishingController:testOrigin',
-        () => ({ result: true, type: 'all' }),
+        () => ({ result: true, type: PhishingDetectorResultType.All }),
       );
 
       // eslint-disable-next-line no-new
@@ -1159,8 +1160,8 @@ describe('SnapInterfaceController', () => {
         ),
       ).toThrow('Invalid URL: The specified URL is not allowed.');
 
-      expect(rootMessenger.call).toHaveBeenNthCalledWith(
-        3,
+      expect(controllerMessenger.call).toHaveBeenNthCalledWith(
+        1,
         'PhishingController:testOrigin',
         'https://foo.bar/',
       );

packages/snaps-controllers/src/test-utils/controller.tsx

@@ -832,6 +832,8 @@ export const getRestrictedSnapInterfaceControllerMessenger = (
     });
   }
 
+  jest.spyOn(snapInterfaceControllerMessenger, 'call');
+
   return snapInterfaceControllerMessenger;
 };