test: check event.data before resolving

mswjs · Sep 19, 2024 · a45981f · a45981f
1 parent 0c99078
commit a45981f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/test/browser/ws-api/ws.clients.browser.test.ts b/test/browser/ws-api/ws.clients.browser.test.ts
@@ -231,7 +231,7 @@ test('clears the list of clients when the page is reloaded', async ({
     })
   }
 
-  await enableMocking(page)
+  await enableMocking()
 
   expect(await page.evaluate(() => window.link.clients.size)).toBe(0)
 

diff --git a/test/browser/ws-api/ws.intercept.client.browser.test.ts b/test/browser/ws-api/ws.intercept.client.browser.test.ts
@@ -59,7 +59,9 @@ test('intercepts outgoing client text message', async ({
       const worker = setupWorker(
         service.addEventListener('connection', ({ client }) => {
           client.addEventListener('message', (event) => {
-            resolve(event.data)
+            if (typeof event.data === 'string') {
+              resolve(event.data)
+            }
           })
         }),
       )
@@ -91,7 +93,9 @@ test('intercepts outgoing client Blob message', async ({
       const worker = setupWorker(
         service.addEventListener('connection', ({ client }) => {
           client.addEventListener('message', (event) => {
-            resolve(event.data.text())
+            if (event.data instanceof Blob) {
+              resolve(event.data.text())
+            }
           })
         }),
       )
@@ -123,7 +127,9 @@ test('intercepts outgoing client ArrayBuffer message', async ({
       const worker = setupWorker(
         service.addEventListener('connection', ({ client }) => {
           client.addEventListener('message', (event) => {
-            resolve(new TextDecoder().decode(event.data))
+            if (event.data instanceof Uint8Array) {
+              resolve(new TextDecoder().decode(event.data))
+            }
           })
         }),
       )

diff --git a/test/browser/ws-api/ws.intercept.server.browser.test.ts b/test/browser/ws-api/ws.intercept.server.browser.test.ts
@@ -43,7 +43,9 @@ test('intercepts incoming server text message', async ({
         service.addEventListener('connection', ({ server }) => {
           server.connect()
           server.addEventListener('message', (event) => {
-            resolve(event.data)
+            if (typeof event.data === 'string') {
+              resolve(event.data)
+            }
           })
         }),
       )
@@ -91,7 +93,9 @@ test('intercepts incoming server Blob message', async ({
         service.addEventListener('connection', ({ server }) => {
           server.connect()
           server.addEventListener('message', (event) => {
-            resolve(event.data.text())
+            if (event.data instanceof Blob) {
+              resolve(event.data.text())
+            }
           })
         }),
       )
@@ -137,7 +141,7 @@ test('intercepts outgoing server ArrayBuffer message', async ({
         service.addEventListener('connection', ({ server }) => {
           server.connect()
           server.addEventListener('message', (event) => {
-            resolve(new TextDecoder().decode(event.data))
+            resolve(new TextDecoder().decode(event.data as Uint8Array))
           })
         }),
       )