chore(validation): fix primary test for H44 [#4]

README.md

@@ -6,7 +6,7 @@ The Rust web accessibility engine.
 
 ```toml
 [dependencies]
-accessibility-rs = "^0.0.48"
+accessibility-rs = "^0.0.49"
 ```
 
 ```rs

accessibility-rs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "accessibility-rs"
-version = "0.0.48"
+version = "0.0.49"
 authors = ["The A11yWatch Project Developers", "Jeff Mendez <[email protected]>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"

accessibility-rs/src/engine/rules/wcag_rule_map.rs

@@ -420,24 +420,57 @@ lazy_static! {
                     let mut elements = Vec::new();
 
                     for ele in nodes {
-                        match ele.0.attr("for") {
-                            Some(s) => {
-                                let selector = unsafe { Selector::parse(&("#".to_string() + &s)).unwrap_unchecked() };
-                                let root_tree = ele.0.tree().root();
-
-                                match ElementRef::new(root_tree) {
-                                    t => {
-                                        let e = t.select(&selector);
+                        let has_valid_aria_label = ele.0.attr("aria-label").map_or(false, |s| !s.trim().is_empty());
+                        let mut has_valid_text_match = false;
+
+                        if !has_valid_aria_label && ele.0.text().next().is_some() {
+                            for child in ele.0.children() {
+                                match ElementRef::wrap(child) {
+                                    Some(child_element) => {
+                                        let name = child_element.value().name();
+
+                                        if vec!["textareas", "select"].contains(&name) {
+                                            has_valid_text_match = true;
+                                        } else if name == "input" {
+                                            match child_element.attr("type") {
+                                                Some(s) => {
+                                                     if vec!["text", "file", "password"].contains(&s) {
+                                                        has_valid_text_match = true;
+                                                     }
+                                                }
+                                                _ => ()
+                                            }
+                                        }
 
-                                        if e.count() == 0 {
-                                            valid = false;
-                                            elements.push(get_unique_selector(&ele.0))
+                                        if has_valid_text_match {
+                                            break;
                                         }
                                     }
+                                    _ => ()
                                 }
                             }
-                            _ => ()
                         }
+
+                        if !has_valid_aria_label && !has_valid_text_match {
+                             match ele.0.attr("for") {
+                                 Some(s) => {
+                                     let selector = unsafe { Selector::parse(&("#".to_string() + &s)).unwrap_unchecked() };
+                                     let root_tree = ele.0.tree().root();
+
+                                     match ElementRef::new(root_tree) {
+                                         t => {
+                                             let e = t.select(&selector);
+
+                                             if e.count() == 0 {
+                                                 valid = false;
+                                                 elements.push(get_unique_selector(&ele.0))
+                                             }
+                                         }
+                                     }
+                                 }
+                                 _ => ()
+                             }
+                         }
                     }
 
                     Validation::new(valid, "NonExistent", elements, Default::default()).into()
@@ -541,7 +574,7 @@ lazy_static! {
                             elements.push(get_unique_selector(&ele));
                         }
                     }
-                    
+
                     Validation::new(valid, "ImageMapAreaNoAlt", elements, Default::default()).into()
                 })
             ])),

accessibility-rs/src/lib.rs

@@ -3,13 +3,13 @@
 //! Audit html to see how it complies with WCAG
 //! standards.
 //!
-//! Accessibility-RS is a web accessibility
+//! accessibility-rs is a web accessibility
 //! engine that can replicate websites without
 //! a browser to get complex accessibility reports.
 //!
-//! # How to use Accessibility-RS
+//! # How to use accessibility-rs
 //!
-//! There are a couple of ways to use Accessibility-RS:
+//! There are a couple of ways to use accessibility-rs:
 //!
 //! - **Audit** perform an audit against an html page.
 //!   - [`audit`] is used to audit a web page for issues.

accessibility-rs/tests/integration_test.rs

@@ -9,7 +9,7 @@ fn _audit() {
     let report = accessibility_rs::audit(AuditConfig::new(
         mock::MOCK_WEBSITE_HTML,
         &mock::MOCK_CSS_RULES,
-        true,
+        false,
         "en",
     ));
     println!("{:?}", report)
@@ -20,7 +20,7 @@ fn _audit_large() {
     let report = accessibility_rs::audit(AuditConfig::new(
         mock::MOCK_HTML_LARGE_PAGE,
         &mock::MOCK_CSS_RULES_LARGE,
-        true,
+        false,
         "en",
     ));
     println!("{:?}", report)

accessibility-rs/tests/unit/area.rs

@@ -1,7 +1,6 @@
 //! Test for anchors.
 
-use accessibility_rs::{engine::audit, AuditConfig};
-use maud::html;
+use accessibility_rs::AuditConfig;
 
 #[test]
 fn _audit_missing_alt_area() {

accessibility-rs/tests/unit/mod.rs

@@ -1,5 +1,6 @@
 pub mod anchor;
 pub mod applet;
+pub mod area;
 pub mod contrast;
 pub mod fieldset;
 pub mod heading;
@@ -8,4 +9,3 @@ pub mod img;
 pub mod input;
 pub mod label;
 pub mod meta;
-pub mod area;