diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5b74d442542..d9e632fa338 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,8 +26,9 @@ follow this format, even those from core contributors. it, you can @-reply a reviewer asking for a review in the pull request or a comment, or you can ask for a review in `#servo` on `irc.mozilla.org`. -- When changing code related to the DOM, add a test to `src/test/html/content`, - either by adding it to an existing test file or creating a new one. +- Add tests relevant to the fixed bug or new feature. For a DOM change this + will usually be a content test; for layout, a reftest. See our [testing + guide](https://github.com/mozilla/servo/wiki/Testing) for more information. For specific git instructions, see [GitHub & Critic PR handling 101](https://github.com/mozilla/servo/wiki/Github-&-Critic-PR-handling-101). diff --git a/mk/check.mk b/mk/check.mk index 384d4c5ab22..e8c4796fa85 100644 --- a/mk/check.mk +++ b/mk/check.mk @@ -89,7 +89,7 @@ check-ref: reftest .PHONY: check-content check-content: contenttest @$(call E, check: contenttests) - $(Q)./contenttest --source-dir=$(S)src/test/html/content $(TESTNAME) + $(Q)./contenttest --source-dir=$(S)src/test/content $(TESTNAME) .PHONY: tidy tidy: diff --git a/src/test/html/content/harness.js b/src/test/content/harness.js similarity index 100% rename from src/test/html/content/harness.js rename to src/test/content/harness.js diff --git a/src/test/html/content/test.jpg b/src/test/content/test.jpg similarity index 100% rename from src/test/html/content/test.jpg rename to src/test/content/test.jpg diff --git a/src/test/html/content/test.png b/src/test/content/test.png similarity index 100% rename from src/test/html/content/test.png rename to src/test/content/test.png diff --git a/src/test/html/content/test_DOMParser.html b/src/test/content/test_DOMParser.html similarity index 100% rename from src/test/html/content/test_DOMParser.html rename to src/test/content/test_DOMParser.html diff --git a/src/test/html/content/test_Event.html b/src/test/content/test_Event.html similarity index 100% rename from src/test/html/content/test_Event.html rename to src/test/content/test_Event.html diff --git a/src/test/html/content/test_MouseEvent.html b/src/test/content/test_MouseEvent.html similarity index 100% rename from src/test/html/content/test_MouseEvent.html rename to src/test/content/test_MouseEvent.html diff --git a/src/test/html/content/test_childnodes.html b/src/test/content/test_childnodes.html similarity index 100% rename from src/test/html/content/test_childnodes.html rename to src/test/content/test_childnodes.html diff --git a/src/test/html/content/test_collections.html b/src/test/content/test_collections.html similarity index 100% rename from src/test/html/content/test_collections.html rename to src/test/content/test_collections.html diff --git a/src/test/html/content/test_create_element.html b/src/test/content/test_create_element.html similarity index 100% rename from src/test/html/content/test_create_element.html rename to src/test/content/test_create_element.html diff --git a/src/test/html/content/test_documentElement.html b/src/test/content/test_documentElement.html similarity index 100% rename from src/test/html/content/test_documentElement.html rename to src/test/content/test_documentElement.html diff --git a/src/test/html/content/test_document_body.html b/src/test/content/test_document_body.html similarity index 100% rename from src/test/html/content/test_document_body.html rename to src/test/content/test_document_body.html diff --git a/src/test/html/content/test_document_characterSet.html b/src/test/content/test_document_characterSet.html similarity index 100% rename from src/test/html/content/test_document_characterSet.html rename to src/test/content/test_document_characterSet.html diff --git a/src/test/html/content/test_document_characterSet_default.html b/src/test/content/test_document_characterSet_default.html similarity index 100% rename from src/test/html/content/test_document_characterSet_default.html rename to src/test/content/test_document_characterSet_default.html diff --git a/src/test/html/content/test_document_characterSet_invalid.html b/src/test/content/test_document_characterSet_invalid.html similarity index 100% rename from src/test/html/content/test_document_characterSet_invalid.html rename to src/test/content/test_document_characterSet_invalid.html diff --git a/src/test/html/content/test_document_characterSet_long.html b/src/test/content/test_document_characterSet_long.html similarity index 100% rename from src/test/html/content/test_document_characterSet_long.html rename to src/test/content/test_document_characterSet_long.html diff --git a/src/test/html/content/test_document_characterSet_short.html b/src/test/content/test_document_characterSet_short.html similarity index 100% rename from src/test/html/content/test_document_characterSet_short.html rename to src/test/content/test_document_characterSet_short.html diff --git a/src/test/html/content/test_document_compatMode.html b/src/test/content/test_document_compatMode.html similarity index 100% rename from src/test/html/content/test_document_compatMode.html rename to src/test/content/test_document_compatMode.html diff --git a/src/test/html/content/test_document_compatMode_loose.html b/src/test/content/test_document_compatMode_loose.html similarity index 100% rename from src/test/html/content/test_document_compatMode_loose.html rename to src/test/content/test_document_compatMode_loose.html diff --git a/src/test/html/content/test_document_compatMode_strict.html b/src/test/content/test_document_compatMode_strict.html similarity index 100% rename from src/test/html/content/test_document_compatMode_strict.html rename to src/test/content/test_document_compatMode_strict.html diff --git a/src/test/html/content/test_document_contenttype.html b/src/test/content/test_document_contenttype.html similarity index 100% rename from src/test/html/content/test_document_contenttype.html rename to src/test/content/test_document_contenttype.html diff --git a/src/test/html/content/test_document_createProcessingInstruction.html b/src/test/content/test_document_createProcessingInstruction.html similarity index 100% rename from src/test/html/content/test_document_createProcessingInstruction.html rename to src/test/content/test_document_createProcessingInstruction.html diff --git a/src/test/html/content/test_document_doctype.html b/src/test/content/test_document_doctype.html similarity index 100% rename from src/test/html/content/test_document_doctype.html rename to src/test/content/test_document_doctype.html diff --git a/src/test/html/content/test_document_getElementById.html b/src/test/content/test_document_getElementById.html similarity index 100% rename from src/test/html/content/test_document_getElementById.html rename to src/test/content/test_document_getElementById.html diff --git a/src/test/html/content/test_document_getElementsByName.html b/src/test/content/test_document_getElementsByName.html similarity index 100% rename from src/test/html/content/test_document_getElementsByName.html rename to src/test/content/test_document_getElementsByName.html diff --git a/src/test/html/content/test_document_head.html b/src/test/content/test_document_head.html similarity index 100% rename from src/test/html/content/test_document_head.html rename to src/test/content/test_document_head.html diff --git a/src/test/html/content/test_document_implementation.html b/src/test/content/test_document_implementation.html similarity index 100% rename from src/test/html/content/test_document_implementation.html rename to src/test/content/test_document_implementation.html diff --git a/src/test/html/content/test_document_set_node_value.html b/src/test/content/test_document_set_node_value.html similarity index 100% rename from src/test/html/content/test_document_set_node_value.html rename to src/test/content/test_document_set_node_value.html diff --git a/src/test/html/content/test_document_title_nontextchildren.html b/src/test/content/test_document_title_nontextchildren.html similarity index 100% rename from src/test/html/content/test_document_title_nontextchildren.html rename to src/test/content/test_document_title_nontextchildren.html diff --git a/src/test/html/content/test_document_url.html b/src/test/content/test_document_url.html similarity index 100% rename from src/test/html/content/test_document_url.html rename to src/test/content/test_document_url.html diff --git a/src/test/html/content/test_element_attribute.html b/src/test/content/test_element_attribute.html similarity index 100% rename from src/test/html/content/test_element_attribute.html rename to src/test/content/test_element_attribute.html diff --git a/src/test/html/content/test_element_attributes.html b/src/test/content/test_element_attributes.html similarity index 100% rename from src/test/html/content/test_element_attributes.html rename to src/test/content/test_element_attributes.html diff --git a/src/test/html/content/test_empty_clientrect.html b/src/test/content/test_empty_clientrect.html similarity index 100% rename from src/test/html/content/test_empty_clientrect.html rename to src/test/content/test_empty_clientrect.html diff --git a/src/test/html/content/test_event_dispatch.html b/src/test/content/test_event_dispatch.html similarity index 100% rename from src/test/html/content/test_event_dispatch.html rename to src/test/content/test_event_dispatch.html diff --git a/src/test/html/content/test_event_dispatch_dynamic.html b/src/test/content/test_event_dispatch_dynamic.html similarity index 100% rename from src/test/html/content/test_event_dispatch_dynamic.html rename to src/test/content/test_event_dispatch_dynamic.html diff --git a/src/test/html/content/test_event_dispatch_order.html b/src/test/content/test_event_dispatch_order.html similarity index 100% rename from src/test/html/content/test_event_dispatch_order.html rename to src/test/content/test_event_dispatch_order.html diff --git a/src/test/html/content/test_event_listener.html b/src/test/content/test_event_listener.html similarity index 100% rename from src/test/html/content/test_event_listener.html rename to src/test/content/test_event_listener.html diff --git a/src/test/html/content/test_exception.html b/src/test/content/test_exception.html similarity index 100% rename from src/test/html/content/test_exception.html rename to src/test/content/test_exception.html diff --git a/src/test/html/content/test_getBoundingClientRect.html b/src/test/content/test_getBoundingClientRect.html similarity index 100% rename from src/test/html/content/test_getBoundingClientRect.html rename to src/test/content/test_getBoundingClientRect.html diff --git a/src/test/html/content/test_getElementsByTagName.html b/src/test/content/test_getElementsByTagName.html similarity index 100% rename from src/test/html/content/test_getElementsByTagName.html rename to src/test/content/test_getElementsByTagName.html diff --git a/src/test/html/content/test_global.html b/src/test/content/test_global.html similarity index 100% rename from src/test/html/content/test_global.html rename to src/test/content/test_global.html diff --git a/src/test/html/content/test_htmlcollection.html b/src/test/content/test_htmlcollection.html similarity index 100% rename from src/test/html/content/test_htmlcollection.html rename to src/test/content/test_htmlcollection.html diff --git a/src/test/html/content/test_img_width_height.html b/src/test/content/test_img_width_height.html similarity index 100% rename from src/test/html/content/test_img_width_height.html rename to src/test/content/test_img_width_height.html diff --git a/src/test/html/content/test_innerHTML.html b/src/test/content/test_innerHTML.html similarity index 100% rename from src/test/html/content/test_innerHTML.html rename to src/test/content/test_innerHTML.html diff --git a/src/test/html/content/test_load_event.html b/src/test/content/test_load_event.html similarity index 100% rename from src/test/html/content/test_load_event.html rename to src/test/content/test_load_event.html diff --git a/src/test/html/content/test_mainelement.html b/src/test/content/test_mainelement.html similarity index 100% rename from src/test/html/content/test_mainelement.html rename to src/test/content/test_mainelement.html diff --git a/src/test/html/content/test_navigator.html b/src/test/content/test_navigator.html similarity index 100% rename from src/test/html/content/test_navigator.html rename to src/test/content/test_navigator.html diff --git a/src/test/html/content/test_node_contains.html b/src/test/content/test_node_contains.html similarity index 100% rename from src/test/html/content/test_node_contains.html rename to src/test/content/test_node_contains.html diff --git a/src/test/html/content/test_node_insertBefore.html b/src/test/content/test_node_insertBefore.html similarity index 100% rename from src/test/html/content/test_node_insertBefore.html rename to src/test/content/test_node_insertBefore.html diff --git a/src/test/html/content/test_node_isEqualNode.html b/src/test/content/test_node_isEqualNode.html similarity index 100% rename from src/test/html/content/test_node_isEqualNode.html rename to src/test/content/test_node_isEqualNode.html diff --git a/src/test/html/content/test_node_replaceChild.html b/src/test/content/test_node_replaceChild.html similarity index 100% rename from src/test/html/content/test_node_replaceChild.html rename to src/test/content/test_node_replaceChild.html diff --git a/src/test/html/content/test_parentnodes.html b/src/test/content/test_parentnodes.html similarity index 100% rename from src/test/html/content/test_parentnodes.html rename to src/test/content/test_parentnodes.html diff --git a/src/test/html/content/test_prototypes.html b/src/test/content/test_prototypes.html similarity index 100% rename from src/test/html/content/test_prototypes.html rename to src/test/content/test_prototypes.html diff --git a/src/test/html/content/test_proxy_setter.html b/src/test/content/test_proxy_setter.html similarity index 100% rename from src/test/html/content/test_proxy_setter.html rename to src/test/content/test_proxy_setter.html diff --git a/src/test/html/content/test_script_src_attribute.html b/src/test/content/test_script_src_attribute.html similarity index 100% rename from src/test/html/content/test_script_src_attribute.html rename to src/test/content/test_script_src_attribute.html diff --git a/src/test/html/content/test_textcontent.html b/src/test/content/test_textcontent.html similarity index 100% rename from src/test/html/content/test_textcontent.html rename to src/test/content/test_textcontent.html diff --git a/src/test/html/content/test_title.html b/src/test/content/test_title.html similarity index 100% rename from src/test/html/content/test_title.html rename to src/test/content/test_title.html diff --git a/src/test/html/content/test_union.html b/src/test/content/test_union.html similarity index 100% rename from src/test/html/content/test_union.html rename to src/test/content/test_union.html diff --git a/src/test/html/content/test_window.html b/src/test/content/test_window.html similarity index 100% rename from src/test/html/content/test_window.html rename to src/test/content/test_window.html