feat: add more tests

Author: DanielleHuisman

Cargo.lock

@@ -10,9 +10,10 @@ repository.workspace = true
 version.workspace = true
 
 [dependencies]
-aria-query = "0.0.4"
+aria-query = "0.0.5"
 dom-accessibility-api = "0.0.3"
 log.workspace = true
+ordered_hash_map = "0.4.0"
 paste = "1.0.15"
 pretty-format = { path = "../pretty-format", version = "0.0.1" }
 regex.workspace = true
@@ -75,7 +76,9 @@ web-sys = { workspace = true, features = [
 [dev-dependencies]
 indoc = "2.0.5"
 mockall = "0.13.0"
+pretty_assertions = "1.4.1"
 send_wrapper = "0.6.0"
+testing_logger = "0.1.1"
 wasm-bindgen-test.workspace = true
 
 [lints.rust]

packages/dom/Cargo.toml

@@ -8,10 +8,10 @@ use crate::{
 
 static CONFIG: LazyLock<Arc<Mutex<Config>>> = LazyLock::new(|| {
     Arc::new(Mutex::new(Config {
-        test_id_attribute: "data-testid".into(),
+        test_id_attribute: "data-testid".to_owned(),
         event_wrapper: Arc::new(|cb| cb()),
         default_hidden: false,
-        default_ignore: "script, style".into(),
+        default_ignore: "script, style".to_owned(),
         show_original_stack_trace: false,
         throw_suggestions: false,
         get_element_error: Arc::new(|message, container| {

packages/dom/src/config.rs

@@ -5,14 +5,15 @@ use regex::Regex;
 use wasm_bindgen::{JsCast, JsValue};
 use web_sys::{Comment, Element, Node, Text};
 
-use crate::util::{named_node_map_to_hashmap, node_list_to_vec};
+use crate::util::{named_node_map_to_hashmap, named_node_map_to_vec, node_list_to_vec};
 
 fn escape_html(text: String) -> String {
     text.replace('<', "&lt;").replace('>', "&gt;")
 }
 
 fn print_props(
-    attributes: HashMap<String, String>,
+    keys: Vec<String>,
+    props: HashMap<String, String>,
     config: &Config,
     indentation: String,
     depth: usize,
@@ -21,25 +22,26 @@ fn print_props(
 ) -> String {
     let indentation_next = format!("{}{}", indentation, config.indent);
 
-    attributes
-        .into_iter()
-        .map(|(key, value)| {
-            let printed = printer(
-                &JsValue::from_str(&value),
-                config,
-                indentation_next.clone(),
-                depth,
-                refs.clone(),
-                None,
-            );
+    keys.into_iter()
+        .filter_map(|key| {
+            props.get(&key).map(|value| {
+                let printed = printer(
+                    &JsValue::from_str(value),
+                    config,
+                    indentation_next.clone(),
+                    depth,
+                    refs.clone(),
+                    None,
+                );
 
-            format!(
-                "{}{}{}={}",
-                config.spacing_inner,
-                indentation,
-                config.colors.prop.paint(&key),
-                config.colors.value.paint(&printed)
-            )
+                format!(
+                    "{}{}{}={}",
+                    config.spacing_inner,
+                    indentation,
+                    config.colors.prop.paint(&key),
+                    config.colors.value.paint(&printed)
+                )
+            })
         })
         .collect::<Vec<_>>()
         .join("")
@@ -67,7 +69,7 @@ fn print_children(
 
             if printed_child.is_empty() && child.node_type() != Node::TEXT_NODE {
                 // A plugin serialized this Node to '' meaning we should ignore it.
-                "".into()
+                "".to_owned()
             } else {
                 format!("{}{}{}", config.spacing_outer, indentation, printed_child)
             }
@@ -99,7 +101,7 @@ fn print_element(
         "<{}{}{}>",
         r#type,
         if printed_props.is_empty() {
-            "".into()
+            "".to_owned()
         } else {
             format!(
                 "{}{}{}{}{}",
@@ -112,9 +114,9 @@ fn print_element(
         },
         if printed_children.is_empty() {
             if !printed_props.is_empty() && !config.min {
-                "/".into()
+                "/".to_owned()
             } else {
-                " /".into()
+                " /".to_owned()
             }
         } else {
             format!(
@@ -207,7 +209,7 @@ impl Plugin for DomElementFilter {
         }
 
         let r#type = if node_is_fragment(node) {
-            "DocumentFragment".into()
+            "DocumentFragment".to_owned()
         } else {
             node.unchecked_ref::<Element>().tag_name().to_lowercase()
         };
@@ -220,6 +222,19 @@ impl Plugin for DomElementFilter {
         print_element(
             r#type,
             print_props(
+                if node_is_fragment(node) {
+                    vec![]
+                } else {
+                    let mut keys =
+                        named_node_map_to_vec(node.unchecked_ref::<Element>().attributes())
+                            .into_iter()
+                            .map(|attr| attr.name())
+                            .collect::<Vec<_>>();
+
+                    keys.sort();
+
+                    keys
+                },
                 if node_is_fragment(node) {
                     HashMap::new()
                 } else {

packages/dom/src/dom_element_filter.rs

@@ -10,7 +10,7 @@ const LABELLED_NODE_NAMES: [&str; 7] = [
 
 fn get_text_content(node: &Node) -> Option<String> {
     if LABELLED_NODE_NAMES.contains(&node.node_name().to_lowercase().as_str()) {
-        Some("".into())
+        Some("".to_owned())
     } else if node.node_type() == Node::TEXT_NODE {
         node.text_content()
     } else {
@@ -62,7 +62,8 @@ fn is_labelable(element: &Element) -> bool {
     Regex::new(r"BUTTON|METER|OUTPUT|PROGRESS|SELECT|TEXTAREA")
         .expect("Regex should be valid.")
         .is_match(&element.tag_name())
-        || element.tag_name() == "INPUT" && element.get_attribute("type") != Some("hidden".into())
+        || element.tag_name() == "INPUT"
+            && element.get_attribute("type") != Some("hidden".to_owned())
 }
 
 #[derive(Clone, Debug)]
@@ -76,7 +77,7 @@ pub fn get_labels(
     element: &HtmlElement,
     selector: Option<String>,
 ) -> Vec<Label> {
-    let selector = selector.unwrap_or("*".into());
+    let selector = selector.unwrap_or("*".to_owned());
 
     let aria_labelled_by = element.get_attribute("aria-labelledby");
     let labels_id = aria_labelled_by
@@ -118,7 +119,7 @@ pub fn get_labels(
                         form_control: None,
                     })
                     .unwrap_or(Label {
-                        content: Some("".into()),
+                        content: Some("".to_owned()),
                         form_control: None,
                     })
             })

packages/dom/src/label_helpers.rs

@@ -25,7 +25,13 @@ pub use matches::get_default_normalizer;
 pub use pretty_dom::*;
 pub use queries::*;
 pub use query_helpers::*;
-pub use role_helpers::{get_roles, is_inaccessible, log_roles};
+pub use role_helpers::{
+    GetRolesOptions, PrettyRolesOptions, get_implicit_aria_roles, get_roles, is_inaccessible,
+    log_roles,
+};
 pub use suggestions::*;
 pub use types::*;
 pub use wait_for::*;
+
+// TODO: Export useful types from `aria_query`.
+pub use aria_query::{AriaRole, AriaRoleDefinitionKey};