Skip to content

Commit ee3fe47

Browse files
committed
Fix tests on channels
1 parent 726e3d6 commit ee3fe47

File tree

2 files changed

+31
-6
lines changed

2 files changed

+31
-6
lines changed

playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCDPSession.java

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.microsoft.playwright;
1818

19+
import com.google.gson.Gson;
1920
import com.google.gson.JsonElement;
2021
import com.google.gson.JsonObject;
2122
import org.junit.jupiter.api.Test;
@@ -49,7 +50,12 @@ void shouldSendEvents() {
4950
cdpSession.send("Network.enable");
5051

5152
List<JsonElement> events = new ArrayList<>();
52-
cdpSession.on("Network.requestWillBeSent", events::add);
53+
cdpSession.on("Network.requestWillBeSent", (JsonObject jsonObject) -> {
54+
// Only register main request, ignore favicon requests.
55+
if ("Document".equals(jsonObject.get("type").getAsString())) {
56+
events.add(jsonObject);
57+
}
58+
});
5359
page.navigate(server.EMPTY_PAGE);
5460

5561
assertEquals(1, events.size());
@@ -136,8 +142,14 @@ void shouldAddMultipleEventListeners() {
136142
cdpSession.send("Network.enable");
137143

138144
List<JsonObject> events = new ArrayList<>();
139-
cdpSession.on("Network.requestWillBeSent", events::add);
140-
cdpSession.on("Network.requestWillBeSent", events::add);
145+
Consumer<JsonObject> listener1 = (JsonObject jsonObject) -> {
146+
// Only register main request, ignore favicon requests.
147+
if ("Document".equals(jsonObject.get("type").getAsString())) {
148+
events.add(jsonObject);
149+
}
150+
};
151+
cdpSession.on("Network.requestWillBeSent", listener1);
152+
cdpSession.on("Network.requestWillBeSent", listener1);
141153

142154
page.navigate(server.EMPTY_PAGE);
143155
assertEquals(2, events.size());
@@ -149,9 +161,15 @@ void shouldRemoveEventListeners() {
149161
cdpSession.send("Network.enable");
150162

151163
List<JsonObject> events = new ArrayList<>();
152-
Consumer<JsonObject> listener1 = events::add;
164+
Consumer<JsonObject> listener1 = (JsonObject jsonObject) -> {
165+
// Only register main request, ignore favicon requests.
166+
if ("Document".equals(jsonObject.get("type").getAsString())) {
167+
events.add(jsonObject);
168+
}
169+
};
170+
Consumer<JsonObject> listener2 = listener1::accept;
153171
cdpSession.on("Network.requestWillBeSent", listener1);
154-
cdpSession.on("Network.requestWillBeSent", events::add);
172+
cdpSession.on("Network.requestWillBeSent", listener2);
155173

156174
page.navigate(server.EMPTY_PAGE);
157175
assertEquals(2, events.size());
@@ -160,6 +178,6 @@ void shouldRemoveEventListeners() {
160178
events.clear();
161179

162180
page.navigate(server.EMPTY_PAGE);
163-
assertEquals(1, events.size());
181+
assertEquals(1, events.size(), new Gson().toJson(events));
164182
}
165183
}

playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCredentials.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ static boolean isChromiumHeadful() {
2929
return isChromium() && isHeadful();
3030
}
3131

32+
static boolean isChromiumChannel() {
33+
// net::ERR_INVALID_AUTH_CREDENTIALS is thrown in --headless=new which
34+
// is the default in all Chromium channels.
35+
return isChromium() && getBrowserChannelFromEnv() != null;
36+
}
37+
38+
3239
@Test
3340
@DisabledIf(value="isChromiumHeadful", disabledReason="fail")
3441
void shouldFailWithoutCredentials() {

0 commit comments

Comments
 (0)