Skip to content

fix: reverse route handlers order #517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 16, 2021
Merged

fix: reverse route handlers order #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion playwright/src/main/java/com/microsoft/playwright/impl/Router.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private static class RouteInfo {
}

void add(UrlMatcher matcher, Consumer<Route> handler) {
routes.add(new RouteInfo(matcher, handler));
routes.add(0, new RouteInfo(matcher, handler));
}

void remove(UrlMatcher matcher, Consumer<Route> handler) {
Expand Down
18 changes: 9 additions & 9 deletions playwright/src/test/java/com/microsoft/playwright/TestBrowserContextRoute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,10 @@ void shouldUnroute() {
Page page = context.newPage();

List<Integer> intercepted = new ArrayList<>();
Consumer<Route> handler1 = route -> {
context.route("**/*", route -> {
intercepted.add(1);
route.resume();
};
context.route("**/empty.html", handler1);
});
context.route("**/empty.html", route -> {
intercepted.add(2);
route.resume();
Expand All @@ -70,22 +69,23 @@ void shouldUnroute() {
intercepted.add(3);
route.resume();
});
context.route("**/*", route -> {
Consumer<Route> handler4 = route -> {
intercepted.add(4);
route.resume();
});
};
context.route("**/empty.html", handler4);
page.navigate(server.EMPTY_PAGE);
assertEquals(asList(1), intercepted);
assertEquals(asList(4), intercepted);

intercepted.clear();
context.unroute("**/empty.html", handler1);
context.unroute("**/empty.html", handler4);
page.navigate(server.EMPTY_PAGE);
assertEquals(asList(2), intercepted);
assertEquals(asList(3), intercepted);

intercepted.clear();
context.unroute("**/empty.html");
page.navigate(server.EMPTY_PAGE);
assertEquals(asList(4), intercepted);
assertEquals(asList(1), intercepted);

context.close();
}
Expand Down
19 changes: 10 additions & 9 deletions playwright/src/test/java/com/microsoft/playwright/TestPageRoute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ void shouldIntercept() {
@Test
void shouldUnroute() {
List<Integer> intercepted = new ArrayList<>();
Consumer<Route> handler1 = route -> {
page.route("**/*", route -> {
intercepted.add(1);
route.resume();
};
page.route("**/empty.html", handler1);
});

page.route("**/empty.html", route -> {
intercepted.add(2);
route.resume();
Expand All @@ -76,22 +76,23 @@ void shouldUnroute() {
intercepted.add(3);
route.resume();
});
page.route("**/*", route -> {
Consumer<Route> handler4 = route -> {
intercepted.add(4);
route.resume();
});
};
page.route("**/empty.html", handler4);
page.navigate(server.EMPTY_PAGE);
assertEquals(asList(1), intercepted);
assertEquals(asList(4), intercepted);

intercepted.clear();
page.unroute("**/empty.html", handler1);
page.unroute("**/empty.html", handler4);
page.navigate(server.EMPTY_PAGE);
assertEquals(asList(2), intercepted);
assertEquals(asList(3), intercepted);

intercepted.clear();
page.unroute("**/empty.html");
page.navigate(server.EMPTY_PAGE);
assertEquals(asList(4), intercepted);
assertEquals(asList(1), intercepted);
}

@Test
Expand Down