Skip to content

Commit 2f6612d

Browse files
committed
Chrome/Edge 130
1 parent 4b0ea4a commit 2f6612d

20 files changed

+476
-446
lines changed

src/main/java/org/htmlunit/BrowserVersion.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ public final class BrowserVersion implements Serializable {
9494
public static final BrowserVersion FIREFOX_ESR = new BrowserVersion(FIREFOX_ESR_NUMERIC, "FF-ESR");
9595

9696
/** Latest Edge. */
97-
public static final BrowserVersion EDGE = new BrowserVersion(129, "Edge");
97+
public static final BrowserVersion EDGE = new BrowserVersion(130, "Edge");
9898

9999
/** Latest Chrome. */
100-
public static final BrowserVersion CHROME = new BrowserVersion(129, "Chrome");
100+
public static final BrowserVersion CHROME = new BrowserVersion(130, "Chrome");
101101

102102
/**
103103
* Array with all supported browsers.
@@ -217,9 +217,9 @@ public final class BrowserVersion implements Serializable {
217217
CHROME.imgAcceptHeader_ = "image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8";
218218
CHROME.cssAcceptHeader_ = "text/css,*/*;q=0.1";
219219
CHROME.scriptAcceptHeader_ = "*/*";
220-
CHROME.secClientHintUserAgentHeader_ = "\"Google Chrome\";v=\""
221-
+ CHROME.getBrowserVersionNumeric() + "\", \"Not=A?Brand\";v=\"8\", \"Chromium\";v=\""
222-
+ CHROME.getBrowserVersionNumeric() + "\"";
220+
CHROME.secClientHintUserAgentHeader_ = "\"Chromium\";v=\""
221+
+ CHROME.getBrowserVersionNumeric() + "\", \"Google Chrome\";v=\""
222+
+ CHROME.getBrowserVersionNumeric() + "\", \"Not?A_Brand\";v=\"99\"";
223223
CHROME.fontHeights_ = new int[] {
224224
0, 1, 2, 4, 5, 5, 6, 8, 9, 10, 11, 12, 15, 16, 16, 17, 18, 20, 21, 22, 23, 25, 26, 26,
225225
27, 28, 30, 31, 32, 33, 34, 36, 37, 37, 38, 40, 42, 43, 44, 45, 47, 48, 48, 49, 51, 52, 53, 54, 55, 57,
@@ -263,9 +263,9 @@ public final class BrowserVersion implements Serializable {
263263
EDGE.imgAcceptHeader_ = "image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8";
264264
EDGE.cssAcceptHeader_ = "text/css,*/*;q=0.1";
265265
EDGE.scriptAcceptHeader_ = "*/*";
266-
EDGE.secClientHintUserAgentHeader_ = "\"Microsoft Edge\";v=\""
267-
+ EDGE.getBrowserVersionNumeric() + "\", \"Not=A?Brand\";v=\"8\", \"Chromium\";v=\""
268-
+ EDGE.getBrowserVersionNumeric() + "\"";
266+
EDGE.secClientHintUserAgentHeader_ = "\"Chromium\";v=\""
267+
+ EDGE.getBrowserVersionNumeric() + "\", \"Microsoft Edge\";v=\""
268+
+ EDGE.getBrowserVersionNumeric() + "\", \"Not?A_Brand\";v=\"99\"";
269269
EDGE.fontHeights_ = new int[] {
270270
0, 1, 2, 4, 5, 5, 6, 8, 9, 10, 11, 12, 15, 16, 16, 17, 18, 20, 21, 22, 23, 25, 26, 26,
271271
27, 28, 30, 31, 32, 33, 34, 36, 37, 37, 38, 40, 42, 43, 44, 45, 47, 48, 48, 49, 51, 52, 53, 54, 55, 57,

src/main/java/org/htmlunit/javascript/host/event/MutationEvent.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
*/
1515
package org.htmlunit.javascript.host.event;
1616

17+
import static org.htmlunit.javascript.configuration.SupportedBrowser.FF;
18+
import static org.htmlunit.javascript.configuration.SupportedBrowser.FF_ESR;
19+
1720
import org.htmlunit.corejs.javascript.ScriptableObject;
1821
import org.htmlunit.javascript.JavaScriptEngine;
1922
import org.htmlunit.javascript.configuration.JsxClass;
@@ -27,8 +30,9 @@
2730
* DOM Level 2 Events</a>.
2831
*
2932
* @author Ahmed Ashour
33+
* @author Ronald Brill
3034
*/
31-
@JsxClass
35+
@JsxClass({FF, FF_ESR})
3236
public class MutationEvent extends Event {
3337

3438
/** Modification. */

src/test/java/org/htmlunit/BrowserVersionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public class BrowserVersionTest {
4040
public void getBrowserVersionNumeric() {
4141
assertEquals(131, BrowserVersion.FIREFOX.getBrowserVersionNumeric());
4242
assertEquals(128, BrowserVersion.FIREFOX_ESR.getBrowserVersionNumeric());
43-
assertEquals(129, BrowserVersion.CHROME.getBrowserVersionNumeric());
44-
assertEquals(129, BrowserVersion.EDGE.getBrowserVersionNumeric());
43+
assertEquals(130, BrowserVersion.CHROME.getBrowserVersionNumeric());
44+
assertEquals(130, BrowserVersion.EDGE.getBrowserVersionNumeric());
4545
}
4646

4747
/**

src/test/java/org/htmlunit/general/DedicatedWorkerGlobalScopeClassNameTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6546,7 +6546,9 @@ public void rtcConfiguration() throws Exception {
65466546
* @throws Exception if the test fails
65476547
*/
65486548
@Test
6549-
@Alerts("exception")
6549+
@Alerts(DEFAULT = "function RTCDataChannel() { [native code] }",
6550+
FF = "exception",
6551+
FF_ESR = "exception")
65506552
public void rtcDataChannel() throws Exception {
65516553
test("RTCDataChannel");
65526554
}

src/test/java/org/htmlunit/general/DedicatedWorkerGlobalScopeTypeOfTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6543,7 +6543,9 @@ public void rtcConfiguration() throws Exception {
65436543
* @throws Exception if the test fails
65446544
*/
65456545
@Test
6546-
@Alerts("undefined")
6546+
@Alerts(DEFAULT = "function",
6547+
FF = "undefined",
6548+
FF_ESR = "undefined")
65476549
public void rtcDataChannel() throws Exception {
65486550
test("RTCDataChannel");
65496551
}

src/test/java/org/htmlunit/general/ElementOwnPropertiesTest.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15911,12 +15911,8 @@ public void gamepadEvent() throws Exception {
1591115911
* @throws Exception if the test fails
1591215912
*/
1591315913
@Test
15914-
@Alerts(CHROME = "ADDITION[E],attrChange[GCE],attrName[GCE],constructor(),initMutationEvent(),MODIFICATION[E],"
15915-
+ "newValue[GCE],prevValue[GCE],relatedNode[GCE],"
15916-
+ "REMOVAL[E]",
15917-
EDGE = "ADDITION[E],attrChange[GCE],attrName[GCE],constructor(),initMutationEvent(),MODIFICATION[E],"
15918-
+ "newValue[GCE],prevValue[GCE],relatedNode[GCE],"
15919-
+ "REMOVAL[E]",
15914+
@Alerts(CHROME = "exception",
15915+
EDGE = "exception",
1592015916
FF = "ADDITION[E],attrChange[GCE],attrName[GCE],constructor(),initMutationEvent(),MODIFICATION[E],"
1592115917
+ "newValue[GCE],prevValue[GCE],relatedNode[GCE],"
1592215918
+ "REMOVAL[E]",

src/test/java/org/htmlunit/general/ElementOwnPropertySymbolsTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2589,7 +2589,9 @@ public void gamepadEvent() throws Exception {
25892589
* @throws Exception if the test fails
25902590
*/
25912591
@Test
2592-
@Alerts("Symbol(Symbol.toStringTag) [C] [MutationEvent]")
2592+
@Alerts(DEFAULT = "exception",
2593+
FF = "Symbol(Symbol.toStringTag) [C] [MutationEvent]",
2594+
FF_ESR = "Symbol(Symbol.toStringTag) [C] [MutationEvent]")
25932595
public void mutationEvent() throws Exception {
25942596
testString("", "document.createEvent('MutationEvent')");
25952597
}

0 commit comments

Comments
 (0)