chore: roll to Playwright 1.26.0-beta-1663620933000 (#1555)

Ports: - [x] microsoft/playwright@a07a4a2 (chore: make parent scope explicit (microsoft/playwright#16819)) - [x] microsoft/playwright@306ab34 (feat(assertions): support toBeEnabled({ enabled }) (microsoft/playwright#17058)) - [x] microsoft/playwright@f0c5810 (feat(assertions): support toBeEditable({ editable }) (microsoft/playwright#17065)) - [x] microsoft/playwright@bca13bc (feat(assertions): support toBeVisible({ visible }) (microsoft/playwright#17207)) - [x] microsoft/playwright@17b203a (feat: added follow and redirect arguments to fetch (microsoft/playwright#17033)) - [x] microsoft/playwright@fea8772 (fix: emit load/domcontentloaded events as reported by the browser) - [x] microsoft/playwright@01d83f1 (fix(har): record request overrides to har (microsoft/playwright#17027))
microsoft · Sep 20, 2022 · 7091748 · 7091748
1 parent 2cc7a84
commit 7091748
Show file tree

Hide file tree

Showing 18 changed files with 592 additions and 212 deletions.
diff --git a/README.md b/README.md
@@ -4,9 +4,9 @@ Playwright is a Python library to automate [Chromium](https://www.chromium.org/H
 
 |          | Linux | macOS | Windows |
 |   :---   | :---: | :---: | :---:   |
-| Chromium <!-- GEN:chromium-version -->105.0.5195.19<!-- GEN:stop --> | ✅ | ✅ | ✅ |
+| Chromium <!-- GEN:chromium-version -->106.0.5249.30<!-- GEN:stop --> | ✅ | ✅ | ✅ |
 | WebKit <!-- GEN:webkit-version -->16.0<!-- GEN:stop --> | ✅ | ✅ | ✅ |
-| Firefox <!-- GEN:firefox-version -->103.0<!-- GEN:stop --> | ✅ | ✅ | ✅ |
+| Firefox <!-- GEN:firefox-version -->104.0<!-- GEN:stop --> | ✅ | ✅ | ✅ |
 
 ## Documentation
 

diff --git a/playwright/_impl/_assertions.py b/playwright/_impl/_assertions.py
@@ -458,22 +458,26 @@ async def not_to_be_disabled(
 
     async def to_be_editable(
         self,
+        editable: bool = None,
         timeout: float = None,
     ) -> None:
         __tracebackhide__ = True
+        if editable is None:
+            editable = True
         await self._expect_impl(
-            "to.be.editable",
+            "to.be.editable" if editable else "to.be.readonly",
             FrameExpectOptions(timeout=timeout),
             None,
             "Locator expected to be editable",
         )
 
     async def not_to_be_editable(
         self,
+        editable: bool = None,
         timeout: float = None,
     ) -> None:
         __tracebackhide__ = True
-        await self._not.to_be_editable(timeout)
+        await self._not.to_be_editable(editable, timeout)
 
     async def to_be_empty(
         self,
@@ -496,22 +500,26 @@ async def not_to_be_empty(
 
     async def to_be_enabled(
         self,
+        enabled: bool = None,
         timeout: float = None,
     ) -> None:
         __tracebackhide__ = True
+        if enabled is None:
+            enabled = True
         await self._expect_impl(
-            "to.be.enabled",
+            "to.be.enabled" if enabled else "to.be.disabled",
             FrameExpectOptions(timeout=timeout),
             None,
             "Locator expected to be enabled",
         )
 
     async def not_to_be_enabled(
         self,
+        enabled: bool = None,
         timeout: float = None,
     ) -> None:
         __tracebackhide__ = True
-        await self._not.to_be_enabled(timeout)
+        await self._not.to_be_enabled(enabled, timeout)
 
     async def to_be_hidden(
         self,
@@ -534,22 +542,26 @@ async def not_to_be_hidden(
 
     async def to_be_visible(
         self,
+        visible: bool = None,
         timeout: float = None,
     ) -> None:
         __tracebackhide__ = True
+        if visible is None:
+            visible = True
         await self._expect_impl(
-            "to.be.visible",
+            "to.be.visible" if visible else "to.be.hidden",
             FrameExpectOptions(timeout=timeout),
             None,
             "Locator expected to be visible",
         )
 
     async def not_to_be_visible(
         self,
+        visible: bool = None,
         timeout: float = None,
     ) -> None:
         __tracebackhide__ = True
-        await self._not.to_be_visible(timeout)
+        await self._not.to_be_visible(visible, timeout)
 
     async def to_be_focused(
         self,

diff --git a/playwright/_impl/_browser_context.py b/playwright/_impl/_browser_context.py
@@ -114,7 +114,6 @@ def __init__(
             lambda params: asyncio.create_task(
                 self._on_route(
                     from_channel(params.get("route")),
-                    from_channel(params.get("request")),
                 )
             ),
         )
@@ -174,15 +173,15 @@ def _on_page(self, page: Page) -> None:
         if page._opener and not page._opener.is_closed():
             page._opener.emit(Page.Events.Popup, page)
 
-    async def _on_route(self, route: Route, request: Request) -> None:
+    async def _on_route(self, route: Route) -> None:
         route_handlers = self._routes.copy()
         for route_handler in route_handlers:
-            if not route_handler.matches(request.url):
+            if not route_handler.matches(route.request.url):
                 continue
             if route_handler.will_expire:
                 self._routes.remove(route_handler)
             try:
-                handled = await route_handler.handle(route, request)
+                handled = await route_handler.handle(route)
             finally:
                 if len(self._routes) == 0:
                     asyncio.create_task(self._disable_interception())

diff --git a/playwright/_impl/_fetch.py b/playwright/_impl/_fetch.py
@@ -102,6 +102,7 @@ async def delete(
         timeout: float = None,
         failOnStatusCode: bool = None,
         ignoreHTTPSErrors: bool = None,
+        maxRedirects: int = None,
     ) -> "APIResponse":
         return await self.fetch(
             url,
@@ -114,6 +115,7 @@ async def delete(
             timeout=timeout,
             failOnStatusCode=failOnStatusCode,
             ignoreHTTPSErrors=ignoreHTTPSErrors,
+            maxRedirects=maxRedirects,
         )
 
     async def head(
@@ -124,6 +126,7 @@ async def head(
         timeout: float = None,
         failOnStatusCode: bool = None,
         ignoreHTTPSErrors: bool = None,
+        maxRedirects: int = None,
     ) -> "APIResponse":
         return await self.fetch(
             url,
@@ -133,6 +136,7 @@ async def head(
             timeout=timeout,
             failOnStatusCode=failOnStatusCode,
             ignoreHTTPSErrors=ignoreHTTPSErrors,
+            maxRedirects=maxRedirects,
         )
 
     async def get(
@@ -143,6 +147,7 @@ async def get(
         timeout: float = None,
         failOnStatusCode: bool = None,
         ignoreHTTPSErrors: bool = None,
+        maxRedirects: int = None,
     ) -> "APIResponse":
         return await self.fetch(
             url,
@@ -152,6 +157,7 @@ async def get(
             timeout=timeout,
             failOnStatusCode=failOnStatusCode,
             ignoreHTTPSErrors=ignoreHTTPSErrors,
+            maxRedirects=maxRedirects,
         )
 
     async def patch(
@@ -165,6 +171,7 @@ async def patch(
         timeout: float = None,
         failOnStatusCode: bool = None,
         ignoreHTTPSErrors: bool = None,
+        maxRedirects: int = None,
     ) -> "APIResponse":
         return await self.fetch(
             url,
@@ -177,6 +184,7 @@ async def patch(
             timeout=timeout,
             failOnStatusCode=failOnStatusCode,
             ignoreHTTPSErrors=ignoreHTTPSErrors,
+            maxRedirects=maxRedirects,
         )
 
     async def put(
@@ -190,6 +198,7 @@ async def put(
         timeout: float = None,
         failOnStatusCode: bool = None,
         ignoreHTTPSErrors: bool = None,
+        maxRedirects: int = None,
     ) -> "APIResponse":
         return await self.fetch(
             url,
@@ -202,6 +211,7 @@ async def put(
             timeout=timeout,
             failOnStatusCode=failOnStatusCode,
             ignoreHTTPSErrors=ignoreHTTPSErrors,
+            maxRedirects=maxRedirects,
         )
 
     async def post(
@@ -215,6 +225,7 @@ async def post(
         timeout: float = None,
         failOnStatusCode: bool = None,
         ignoreHTTPSErrors: bool = None,
+        maxRedirects: int = None,
     ) -> "APIResponse":
         return await self.fetch(
             url,
@@ -227,6 +238,7 @@ async def post(
             timeout=timeout,
             failOnStatusCode=failOnStatusCode,
             ignoreHTTPSErrors=ignoreHTTPSErrors,
+            maxRedirects=maxRedirects,
         )
 
     async def fetch(
@@ -241,6 +253,7 @@ async def fetch(
         timeout: float = None,
         failOnStatusCode: bool = None,
         ignoreHTTPSErrors: bool = None,
+        maxRedirects: int = None,
     ) -> "APIResponse":
         request = (
             cast(network.Request, to_impl(urlOrRequest))
@@ -253,6 +266,9 @@ async def fetch(
         assert (
             (1 if data else 0) + (1 if form else 0) + (1 if multipart else 0)
         ) <= 1, "Only one of 'data', 'form' or 'multipart' can be specified"
+        assert (
+            maxRedirects is None or maxRedirects >= 0
+        ), "'max_redirects' must be greater than or equal to '0'"
         url = request.url if request else urlOrRequest
         method = method or (request.method if request else "GET")
         # Cannot call allHeaders() here as the request may be paused inside route handler.
@@ -319,6 +335,7 @@ def filter_none(input: Dict) -> Dict:
                     "timeout": timeout,
                     "failOnStatusCode": failOnStatusCode,
                     "ignoreHTTPSErrors": ignoreHTTPSErrors,
+                    "maxRedirects": maxRedirects,
                 }
             ),
         )

diff --git a/playwright/_impl/_helper.py b/playwright/_impl/_helper.py
@@ -271,15 +271,15 @@ def __init__(
     def matches(self, request_url: str) -> bool:
         return self.matcher.matches(request_url)
 
-    async def handle(self, route: "Route", request: "Request") -> bool:
+    async def handle(self, route: "Route") -> bool:
         handled_future = route._start_handling()
         handler_task = []
 
         def impl() -> None:
             self._handled_count += 1
             result = cast(
                 Callable[["Route", "Request"], Union[Coroutine, Any]], self.handler
-            )(route, request)
+            )(route, route.request)
             if inspect.iscoroutine(result):
                 handler_task.append(asyncio.create_task(result))
 

diff --git a/playwright/_impl/_page.py b/playwright/_impl/_page.py
@@ -193,9 +193,7 @@ def __init__(
         self._channel.on(
             "route",
             lambda params: asyncio.create_task(
-                self._on_route(
-                    from_channel(params["route"]), from_channel(params["request"])
-                )
+                self._on_route(from_channel(params["route"]))
             ),
         )
         self._channel.on("video", lambda params: self._on_video(params))
@@ -235,21 +233,21 @@ def _on_frame_detached(self, frame: Frame) -> None:
         frame._detached = True
         self.emit(Page.Events.FrameDetached, frame)
 
-    async def _on_route(self, route: Route, request: Request) -> None:
+    async def _on_route(self, route: Route) -> None:
         route_handlers = self._routes.copy()
         for route_handler in route_handlers:
-            if not route_handler.matches(request.url):
+            if not route_handler.matches(route.request.url):
                 continue
             if route_handler.will_expire:
                 self._routes.remove(route_handler)
             try:
-                handled = await route_handler.handle(route, request)
+                handled = await route_handler.handle(route)
             finally:
                 if len(self._routes) == 0:
                     asyncio.create_task(self._disable_interception())
             if handled:
                 return
-        await self._browser_context._on_route(route, request)
+        await self._browser_context._on_route(route)
 
     def _on_binding(self, binding_call: "BindingCall") -> None:
         func = self._bindings.get(binding_call._initializer["name"])