Add tests

Author: FrederikBolding

packages/snaps-controllers/coverage.json

@@ -1,6 +1,6 @@
 {
-  "branches": 93.42,
+  "branches": 93.46,
   "functions": 97.38,
-  "lines": 98.34,
+  "lines": 98.35,
   "statements": 98.08
 }

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

@@ -19,8 +19,12 @@ import {
   SnapEndowments,
 } from '@metamask/snaps-rpc-methods';
 import type { SnapId } from '@metamask/snaps-sdk';
-import { AuxiliaryFileEncoding, text } from '@metamask/snaps-sdk';
-import { Text } from '@metamask/snaps-sdk/jsx';
+import {
+  AuxiliaryFileEncoding,
+  text,
+  UserInputEventType,
+} from '@metamask/snaps-sdk';
+import { Text, Box, Button } from '@metamask/snaps-sdk/jsx';
 import type { SnapPermissions, RpcOrigins } from '@metamask/snaps-utils';
 import {
   getPlatformVersion,
@@ -2242,7 +2246,11 @@ describe('SnapController', () => {
           snapId: snap.id,
           origin: MOCK_ORIGIN,
           handler: HandlerType.OnUserInput,
-          request: { jsonrpc: '2.0', method: 'test' },
+          request: {
+            jsonrpc: '2.0',
+            method: 'test',
+            params: { id: MOCK_INTERFACE_ID },
+          },
         }),
       ).toBeUndefined();
 
@@ -2770,6 +2778,77 @@ describe('SnapController', () => {
       snapController.destroy();
     });
 
+    it('injects context into onUserInput', async () => {
+      const rootMessenger = getControllerMessenger();
+      const messenger = getSnapControllerMessenger(rootMessenger);
+      const snapController = getSnapController(
+        getSnapControllerOptions({
+          messenger,
+          state: {
+            snaps: getPersistedSnapsState(),
+          },
+        }),
+      );
+
+      rootMessenger.registerActionHandler(
+        'SnapInterfaceController:getInterface',
+        () => ({
+          id: MOCK_INTERFACE_ID,
+          snapId: MOCK_SNAP_ID,
+          content: (
+            <Box>
+              <Button name="button">Click me</Button>
+            </Box>
+          ),
+          state: {},
+          context: { foo: 'bar' },
+          contentType: null,
+        }),
+      );
+
+      await snapController.handleRequest({
+        snapId: MOCK_SNAP_ID,
+        origin: MOCK_ORIGIN,
+        handler: HandlerType.OnUserInput,
+        request: {
+          jsonrpc: '2.0',
+          method: ' ',
+          params: {
+            id: MOCK_INTERFACE_ID,
+            event: {
+              type: UserInputEventType.ButtonClickEvent,
+              name: 'button',
+            },
+          },
+        },
+      });
+
+      expect(rootMessenger.call).toHaveBeenNthCalledWith(
+        4,
+        'ExecutionService:handleRpcRequest',
+        MOCK_SNAP_ID,
+        {
+          origin: MOCK_ORIGIN,
+          handler: HandlerType.OnUserInput,
+          request: {
+            id: expect.any(String),
+            method: ' ',
+            jsonrpc: '2.0',
+            params: {
+              id: MOCK_INTERFACE_ID,
+              event: {
+                type: UserInputEventType.ButtonClickEvent,
+                name: 'button',
+              },
+              context: { foo: 'bar' },
+            },
+          },
+        },
+      );
+
+      snapController.destroy();
+    });
+
     it('throws if onTransaction handler returns a phishing link', async () => {
       const rootMessenger = getControllerMessenger();
       const messenger = getSnapControllerMessenger(rootMessenger);

packages/snaps-controllers/src/snaps/SnapController.ts

@@ -3789,15 +3789,15 @@ export class SnapController extends BaseController<
         assert(request.params && hasProperty(request.params, 'id'));
 
         const interfaceId = request.params.id as string;
-        const interfaceState = this.messagingSystem.call(
+        const { context } = this.messagingSystem.call(
           'SnapInterfaceController:getInterface',
           snapId,
           interfaceId,
         );
 
         return {
           ...request,
-          params: { ...request.params, context: interfaceState.context },
+          params: { ...request.params, context },
         };
       }
 

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

@@ -22,7 +22,8 @@ import {
   SnapEndowments,
   WALLET_SNAP_PERMISSION_KEY,
 } from '@metamask/snaps-rpc-methods';
-import type { SnapId, text } from '@metamask/snaps-sdk';
+import type { SnapId } from '@metamask/snaps-sdk';
+import { text } from '@metamask/snaps-sdk';
 import { SnapCaveatType } from '@metamask/snaps-utils';
 import {
   MockControllerMessenger,
@@ -440,7 +441,12 @@ export const getControllerMessenger = (registry = new MockSnapsRegistry()) => {
       if (id !== MOCK_INTERFACE_ID) {
         throw new Error(`Interface with id '${id}' not found.`);
       }
-      return { snapId, content: text('foo bar'), state: {} } as StoredInterface;
+      return {
+        snapId,
+        content: text('foo bar'),
+        state: {},
+        context: null,
+      } as StoredInterface;
     },
   );