fix: reverse route handlers order (microsoft#804)

mxschmitt · web-flow · commit 7640f9019f83 · 2021-07-14T17:06:15.000+02:00
diff --git a/playwright/_impl/_browser_context.py b/playwright/_impl/_browser_context.py
@@ -240,8 +240,8 @@ async def expose_function(self, name: str, callback: Callable) -> None:
         await self.expose_binding(name, lambda source, *args: callback(*args))
 
     async def route(self, url: URLMatch, handler: RouteHandler) -> None:
-        self._routes.append(
-            RouteHandlerEntry(URLMatcher(self._options.get("baseURL"), url), handler)
+        self._routes.insert(
+            0, RouteHandlerEntry(URLMatcher(self._options.get("baseURL"), url), handler)
         )
         if len(self._routes) == 1:
             await self._channel.send(
diff --git a/playwright/_impl/_page.py b/playwright/_impl/_page.py
@@ -510,10 +510,11 @@ async def add_init_script(
         await self._channel.send("addInitScript", dict(source=script))
 
     async def route(self, url: URLMatch, handler: RouteHandler) -> None:
-        self._routes.append(
+        self._routes.insert(
+            0,
             RouteHandlerEntry(
                 URLMatcher(self._browser_context._options.get("baseURL"), url), handler
-            )
+            ),
         )
         if len(self._routes) == 1:
             await self._channel.send(
diff --git a/tests/async/test_browsercontext.py b/tests/async/test_browsercontext.py
@@ -464,30 +464,31 @@ def handler(route, request, ordinal):
         intercepted.append(ordinal)
         asyncio.create_task(route.continue_())
 
-    def handler1(route, request):
-        handler(route, request, 1)
-
-    await context.route("**/empty.html", handler1)
+    await context.route("**/*", lambda route, request: handler(route, request, 1))
     await context.route(
         "**/empty.html", lambda route, request: handler(route, request, 2)
     )
     await context.route(
         "**/empty.html", lambda route, request: handler(route, request, 3)
     )
-    await context.route("**/*", lambda route, request: handler(route, request, 4))
+
+    def handler4(route, request):
+        handler(route, request, 4)
+
+    await context.route("**/empty.html", handler4)
 
     await page.goto(server.EMPTY_PAGE)
-    assert intercepted == [1]
+    assert intercepted == [4]
 
     intercepted = []
-    await context.unroute("**/empty.html", handler1)
+    await context.unroute("**/empty.html", handler4)
     await page.goto(server.EMPTY_PAGE)
-    assert intercepted == [2]
+    assert intercepted == [3]
 
     intercepted = []
     await context.unroute("**/empty.html")
     await page.goto(server.EMPTY_PAGE)
-    assert intercepted == [4]
+    assert intercepted == [1]
 
 
 async def test_route_should_yield_to_page_route(context, server):
diff --git a/tests/async/test_interception.py b/tests/async/test_interception.py
@@ -46,47 +46,48 @@ async def handle_request(route, request):
 async def test_page_route_should_unroute(page: Page, server):
     intercepted = []
 
-    def handler1(route):
-        intercepted.append(1)
-        asyncio.create_task(route.continue_())
-
-    await page.route("**/empty.html", handler1)
     await page.route(
-        "**/empty.html",
+        "**/*",
         lambda route: (
-            intercepted.append(2),  # type: ignore
+            intercepted.append(1),
             asyncio.create_task(route.continue_()),
         ),
     )
 
     await page.route(
         "**/empty.html",
         lambda route: (
-            intercepted.append(3),  # type: ignore
+            intercepted.append(2),
             asyncio.create_task(route.continue_()),
         ),
     )
 
     await page.route(
-        "**/*",
+        "**/empty.html",
         lambda route: (
-            intercepted.append(4),  # type: ignore
+            intercepted.append(3),
             asyncio.create_task(route.continue_()),
         ),
     )
 
+    def handler4(route):
+        intercepted.append(4)
+        asyncio.create_task(route.continue_())
+
+    await page.route("**/empty.html", handler4)
+
     await page.goto(server.EMPTY_PAGE)
-    assert intercepted == [1]
+    assert intercepted == [4]
 
     intercepted = []
-    await page.unroute("**/empty.html", handler1)
+    await page.unroute("**/empty.html", handler4)
     await page.goto(server.EMPTY_PAGE)
-    assert intercepted == [2]
+    assert intercepted == [3]
 
     intercepted = []
     await page.unroute("**/empty.html")
     await page.goto(server.EMPTY_PAGE)
-    assert intercepted == [4]
+    assert intercepted == [1]
 
 
 async def test_page_route_should_work_when_POST_is_redirected_with_302(page, server):
