fix(websocket): error handling (microsoft#756)

mxschmitt · web-flow · commit 91755db9bcbe · 2021-06-15T19:49:10.000+02:00
diff --git a/playwright/_impl/_network.py b/playwright/_impl/_network.py
@@ -295,7 +295,8 @@ def __init__(
             lambda params: self._on_frame_received(params["opcode"], params["data"]),
         )
         self._channel.on(
-            "error", lambda params: self.emit(WebSocket.Events.Error, params["error"])
+            "socketError",
+            lambda params: self.emit(WebSocket.Events.Error, params["error"]),
         )
         self._channel.on("close", lambda params: self._on_close())
 
diff --git a/tests/async/test_websocket.py b/tests/async/test_websocket.py
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import asyncio
+
 import pytest
 from flaky import flaky
 
@@ -125,3 +127,22 @@ async def test_should_reject_wait_for_event_on_close_and_error(page, ws_server):
         async with ws.expect_event("framesent"):
             await page.evaluate("window.ws.close()")
     assert exc_info.value.message == "Socket closed"
+
+
+async def test_should_emit_error_event(page, server, browser_name):
+    future = asyncio.Future()
+    page.on(
+        "websocket",
+        lambda websocket: websocket.on(
+            "socketerror", lambda err: future.set_result(err)
+        ),
+    )
+    await page.evaluate(
+        """port => new WebSocket(`ws://localhost:${port}/bogus-ws`)""",
+        server.PORT,
+    )
+    err = await future
+    if browser_name == "firefox":
+        assert err == "CLOSE_ABNORMAL"
+    else:
+        assert ": 404" in err

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,8 @@ def __init__(`
`295`	`295`	`lambda params: self._on_frame_received(params["opcode"], params["data"]),`
`296`	`296`	`)`
`297`	`297`	`self._channel.on(`
`298`		`- "error", lambda params: self.emit(WebSocket.Events.Error, params["error"])`
	`298`	`+ "socketError",`
	`299`	`+ lambda params: self.emit(WebSocket.Events.Error, params["error"]),`
`299`	`300`	`)`
`300`	`301`	`self._channel.on("close", lambda params: self._on_close())`
`301`	`302`