diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index eba0da0ecf0..4fbeada837c 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -35238,7 +35238,10 @@
"wdspec": []
},
"local_changes": {
- "deleted": [],
+ "deleted": [
+ "html/dom/documents/dom-tree-accessors/document.body-getter.html",
+ "html/dom/documents/dom-tree-accessors/document.body-setter-01.html"
+ ],
"deleted_reftests": {},
"items": {
"reftest": {
@@ -35254,6 +35257,14 @@
"url": "/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_a.html"
}
]
+ },
+ "testharness": {
+ "html/dom/documents/dom-tree-accessors/Document.body.html": [
+ {
+ "path": "html/dom/documents/dom-tree-accessors/Document.body.html",
+ "url": "/html/dom/documents/dom-tree-accessors/Document.body.html"
+ }
+ ]
}
},
"reftest_nodes": {
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 3091ab85f53..bc31d8c61a5 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -6088,12 +6088,6 @@
"url": "/_mozilla/mozilla/document_activeElement.html"
}
],
- "mozilla/document_body.html": [
- {
- "path": "mozilla/document_body.html",
- "url": "/_mozilla/mozilla/document_body.html"
- }
- ],
"mozilla/document_characterSet.html": [
{
"path": "mozilla/document_characterSet.html",
diff --git a/tests/wpt/mozilla/tests/mozilla/document_body.html b/tests/wpt/mozilla/tests/mozilla/document_body.html
deleted file mode 100644
index c77da6cda15..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/document_body.html
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.body-getter.html b/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.body.html
similarity index 73%
rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.body-getter.html
rename to tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.body.html
index 90ca7e59a03..07f1edf939c 100644
--- a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.body-getter.html
+++ b/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.body.html
@@ -118,4 +118,52 @@ test(function() {
doc.appendChild(doc.createElementNS("http://example.org/test", "frameset"));
assert_equals(doc.body, null);
}, "Non-HTML frameset as the root node");
+
+test(function() {
+ assert_not_equals(document.body, null);
+ assert_true(document.body instanceof HTMLBodyElement, "should be HTMLBodyElement");
+ assert_equals(document.body.tagName, "BODY");
+}, "existing document's body");
+
+
+var originalBody = document.body;
+test(function() {
+ assert_throws(new TypeError(), function() {
+ document.body = "text"
+ })
+ assert_equals(document.body, originalBody);
+}, "Setting document.body to a string.")
+test(function() {
+ assert_throws("HierarchyRequestError", function() {
+ document.body = document.createElement("div")
+ })
+ assert_equals(document.body, originalBody);
+}, "Setting document.body to a div element.")
+test(function() {
+ var doc = createDocument();
+ assert_throws("HierarchyRequestError", function() {
+ doc.body = doc.createElement("body")
+ })
+ assert_equals(doc.body, null);
+}, "Setting document.body when there's no root element.")
+test(function() {
+ var doc = document.implementation.createHTMLDocument();
+
+ var new_body = doc.createElement("body");
+ assert_true(new_body instanceof HTMLBodyElement, "should be HTMLBodyElement");
+ assert_equals(new_body.tagName, "BODY");
+
+ doc.body = new_body;
+ assert_equals(doc.body, new_body);
+}, "Setting document.body to a new body element.");
+test(function() {
+ var doc = document.implementation.createHTMLDocument();
+
+ var new_frameset = doc.createElement("frameset");
+ assert_true(new_frameset instanceof HTMLFrameSetElement, "should be HTMLFrameSetElement");
+ assert_equals(new_frameset.tagName, "FRAMESET");
+
+ doc.body = new_frameset;
+ assert_equals(doc.body, new_frameset, "test6-3, append frameset to a new document");
+}, "Setting document.body to a new frameset element.");
diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.body-setter-01.html b/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.body-setter-01.html
deleted file mode 100644
index f3a1638116c..00000000000
--- a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.body-setter-01.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
-Setting document.body to incorrect values
-
-
-
-
-
-
-