expect_request/response fixes

Author: mxschmitt

playwright/_impl/_page.py

@@ -1234,15 +1234,22 @@ def expect_request(
         urlOrPredicate: URLMatchRequest,
         timeout: float = None,
     ) -> EventContextManagerImpl[Request]:
+        def my_predicate(request: Request) -> bool:
+            if not callable(urlOrPredicate) and url_matches(
+                self._browser_context._options.get("baseURL"),
+                request.url,
+                urlOrPredicate,
+            ):
+                return True
+            if callable(urlOrPredicate):
+                return urlOrPredicate(request)
+            return True
+
         trimmed_url = trim_url(urlOrPredicate)
         log_line = f"waiting for request {trimmed_url}" if trimmed_url else None
         return self._expect_event(
             Page.Events.Request,
-            predicate=lambda request: url_matches(
-                self._browser_context._options.get("baseURL"),
-                request.url,
-                cast(URLMatch, urlOrPredicate),
-            ),
+            predicate=my_predicate,
             timeout=timeout,
             log_line=log_line,
         )
@@ -1261,15 +1268,22 @@ def expect_response(
         urlOrPredicate: URLMatchResponse,
         timeout: float = None,
     ) -> EventContextManagerImpl[Response]:
+        def my_predicate(request: Request) -> bool:
+            if not callable(urlOrPredicate) and url_matches(
+                self._browser_context._options.get("baseURL"),
+                request.url,
+                urlOrPredicate,
+            ):
+                return True
+            if callable(urlOrPredicate):
+                return urlOrPredicate(request)
+            return True
+
         trimmed_url = trim_url(urlOrPredicate)
         log_line = f"waiting for response {trimmed_url}" if trimmed_url else None
         return self._expect_event(
             Page.Events.Response,
-            predicate=lambda repsonse: url_matches(
-                self._browser_context._options.get("baseURL"),
-                repsonse.url,
-                cast(URLMatch, urlOrPredicate),
-            ),
+            predicate=my_predicate,
             timeout=timeout,
             log_line=log_line,
         )