Firefox 149, Chrome 147

Author: rbri

src/main/java/org/htmlunit/javascript/host/WebSocket.java

@@ -154,7 +154,14 @@ public void onWebSocketText(final String message) {
                     msgEvent.setParentScope(scope);
                     msgEvent.setPrototype(getPrototype(msgEvent.getClass()));
                     if (originSet_) {
-                        msgEvent.setOrigin(getUrl());
+                        try {
+                            URL originUrl = UrlUtils.toUrlUnsafe(getUrl());
+                            originUrl = UrlUtils.getUrlWithoutPathRefQuery(originUrl);
+                            msgEvent.setOrigin(originUrl.toExternalForm());
+                        }
+                        catch (final MalformedURLException e) {
+                            // ignore
+                        }
                     }
                     msgEvent.setSrcElement(WebSocket.this);
                     fire(msgEvent);
@@ -172,7 +179,14 @@ public void onWebSocketBinary(final byte[] data, final int offset, final int len
                     msgEvent.setParentScope(scope);
                     msgEvent.setPrototype(getPrototype(msgEvent.getClass()));
                     if (originSet_) {
-                        msgEvent.setOrigin(getUrl());
+                        try {
+                            URL originUrl = UrlUtils.toUrlUnsafe(getUrl());
+                            originUrl = UrlUtils.getUrlWithoutPathRefQuery(originUrl);
+                            msgEvent.setOrigin(originUrl.toExternalForm());
+                        }
+                        catch (final MalformedURLException e) {
+                            // ignore
+                        }
                     }
                     msgEvent.setSrcElement(WebSocket.this);
                     fire(msgEvent);

src/test/java/org/htmlunit/javascript/host/WebSocketTest.java

@@ -489,26 +489,26 @@ public void events() throws Exception {
                        "onOpen", "open", "[object WebSocket]", "[object WebSocket]",
                        "undefined", "undefined", "undefined", "undefined",
                        "onMessageTextListener", "message", "[object WebSocket]", "[object WebSocket]",
-                       "server_text", "§§URL§§/ws", "", "null",
+                       "server_text", "§§URL§§", "", "null",
                        "onMessageText", "message", "[object WebSocket]", "[object WebSocket]",
-                       "server_text", "§§URL§§/ws", "", "null",
+                       "server_text", "§§URL§§", "", "null",
                        "onMessageBinaryListener", "message", "[object WebSocket]", "[object WebSocket]",
-                       "[object ArrayBuffer]", "§§URL§§/ws", "", "null",
+                       "[object ArrayBuffer]", "§§URL§§", "", "null",
                        "onMessageBinary", "message", "[object WebSocket]", "[object WebSocket]",
-                       "[object ArrayBuffer]", "§§URL§§/ws", "", "null",
+                       "[object ArrayBuffer]", "§§URL§§", "", "null",
                        "onCloseListener code: 1000  wasClean: true",
                        "onClose code: 1000  wasClean: true"},
             FF_ESR = {"onOpenListener",
                       "onOpen", "open", "[object WebSocket]", "[object WebSocket]",
                       "undefined", "undefined", "undefined", "undefined",
                       "onMessageTextListener", "message", "[object WebSocket]", "[object WebSocket]",
-                      "server_text", "§§URL§§/ws", "", "null",
+                      "server_text", "§§URL§§", "", "null",
                       "onMessageText", "message", "[object WebSocket]", "[object WebSocket]",
-                      "server_text", "§§URL§§/ws", "", "null",
+                      "server_text", "§§URL§§", "", "null",
                       "onMessageBinaryListener", "message", "[object WebSocket]", "[object WebSocket]",
-                      "[object ArrayBuffer]", "§§URL§§/ws", "", "null",
+                      "[object ArrayBuffer]", "§§URL§§", "", "null",
                       "onMessageBinary", "message", "[object WebSocket]", "[object WebSocket]",
-                      "[object ArrayBuffer]", "§§URL§§/ws", "", "null",
+                      "[object ArrayBuffer]", "§§URL§§", "", "null",
                       "onCloseListener code: 1000  wasClean: true",
                       "onClose code: 1000  wasClean: true"})
     public void wasClean() throws Exception {

src/test/java/org/htmlunit/javascript/host/Window2Test.java

@@ -984,6 +984,8 @@ public void heightsAndWidths() throws Exception {
             EDGE = {"true", "0", "137", "true", "true", "24"},
             FF = {"true", "0", "94", "true", "true", "16"},
             FF_ESR = {"true", "0", "94", "true", "true", "16"})
+    @HtmlUnitNYI(CHROME = {"true", "0", "147", "true", "true", "16"},
+            EDGE = {"true", "0", "138", "true", "true", "24"})
     public void heightsAndWidthsQuirks() throws Exception {
         final String html =
             "<html><body onload='test()'><script>\n"
@@ -1047,6 +1049,7 @@ public void setInnerHeight() throws Exception {
             EDGE = {"true", "1234"},
             FF = {"true", "1234"},
             FF_ESR = {"true", "1234"})
+    @HtmlUnitNYI(CHROME = {"true", "1234"})
     public void setOuterWidth() throws Exception {
         final String html = DOCTYPE_HTML
             + "<html><body onload='test()'><script>\n"
@@ -1069,6 +1072,7 @@ public void setOuterWidth() throws Exception {
             EDGE = {"true", "1234"},
             FF = {"true", "1234"},
             FF_ESR = {"true", "1234"})
+    @HtmlUnitNYI(CHROME = {"true", "1234"})
     public void setOuterHeight() throws Exception {
         final String html = DOCTYPE_HTML
             + "<html><body onload='test()'><script>\n"