Fix tests and re-order fetch notification

Author: FrederikBolding

packages/snaps-execution-environments/src/common/BaseSnapExecutor.test.browser.ts

@@ -264,12 +264,6 @@ describe('BaseSnapExecutor', () => {
       },
     });
 
-    expect(await executor.readCommand()).toStrictEqual({
-      jsonrpc: '2.0',
-      method: 'OutboundResponse',
-      params: { source: 'snap.request' },
-    });
-
     expect(await executor.readCommand()).toStrictEqual({
       id: 2,
       jsonrpc: '2.0',
@@ -407,12 +401,6 @@ describe('BaseSnapExecutor', () => {
       ],
     });
 
-    expect(await executor.readCommand()).toStrictEqual({
-      jsonrpc: '2.0',
-      method: 'OutboundRequest',
-      params: { source: 'snap.request' },
-    });
-
     const getSnapsRequest = await executor.readRpc();
     expect(getSnapsRequest).toStrictEqual({
       name: 'metamask-provider',
@@ -441,12 +429,6 @@ describe('BaseSnapExecutor', () => {
       },
     });
 
-    expect(await executor.readCommand()).toStrictEqual({
-      jsonrpc: '2.0',
-      method: 'OutboundResponse',
-      params: { source: 'snap.request' },
-    });
-
     expect(await executor.readCommand()).toStrictEqual({
       id: 2,
       jsonrpc: '2.0',
@@ -778,12 +760,6 @@ describe('BaseSnapExecutor', () => {
       ],
     });
 
-    expect(await executor.readCommand()).toStrictEqual({
-      jsonrpc: '2.0',
-      method: 'OutboundRequest',
-      params: { source: 'snap.request' },
-    });
-
     const request = await executor.readRpc();
     expect(request).toStrictEqual({
       name: 'metamask-provider',
@@ -811,12 +787,6 @@ describe('BaseSnapExecutor', () => {
       },
     });
 
-    expect(await executor.readCommand()).toStrictEqual({
-      jsonrpc: '2.0',
-      method: 'OutboundResponse',
-      params: { source: 'snap.request' },
-    });
-
     expect(await executor.readCommand()).toStrictEqual({
       id: 2,
       jsonrpc: '2.0',

packages/snaps-execution-environments/src/common/endowments/network.ts

@@ -226,14 +226,14 @@ const createNetwork = ({ notify }: EndowmentFactoryOptions = {}) => {
     return await withTeardown(
       (async () => {
         try {
-          await notify({
-            method: 'OutboundRequest',
-            params: { source: 'fetch' },
-          });
           const fetchPromise = fetch(input, {
             ...init,
             signal: abortController.signal,
           });
+          await notify({
+            method: 'OutboundRequest',
+            params: { source: 'fetch' },
+          });
 
           openFetchConnection = {
             cancel: async () => {