From 866dbe66892d46731b16b23bae013f447f259a4a Mon Sep 17 00:00:00 2001
From: Muhammad Hamza <muhammadhamza1311@gmail.com>
Date: Mon, 8 Aug 2022 17:35:27 +0500
Subject: [PATCH] enable disabled test, fmt

---
 examples/Cargo.lock                           | 22 +++++++++++---
 .../yew/src/dom_bundle/btag/attributes.rs     | 29 ++++++++++---------
 packages/yew/src/dom_bundle/btag/mod.rs       | 20 ++++++++++---
 3 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/examples/Cargo.lock b/examples/Cargo.lock
index fe4c6885716..391e2435811 100644
--- a/examples/Cargo.lock
+++ b/examples/Cargo.lock
@@ -2270,21 +2270,33 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.35"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
+checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307"
 dependencies = [
  "cfg-if",
  "log",
  "pin-project-lite",
+ "tracing-attributes",
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-attributes"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "tracing-core"
-version = "0.1.28"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7"
+checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7"
 dependencies = [
  "once_cell",
 ]
@@ -2668,6 +2680,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tokio-util 0.7.3",
+ "tracing",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -2704,6 +2717,7 @@ dependencies = [
  "route-recognizer",
  "serde",
  "serde_urlencoded",
+ "tracing",
  "wasm-bindgen",
  "web-sys",
  "yew",
diff --git a/packages/yew/src/dom_bundle/btag/attributes.rs b/packages/yew/src/dom_bundle/btag/attributes.rs
index d8d4136f354..f9c06de2ce9 100644
--- a/packages/yew/src/dom_bundle/btag/attributes.rs
+++ b/packages/yew/src/dom_bundle/btag/attributes.rs
@@ -269,34 +269,40 @@ impl Apply for Attributes {
 #[cfg(target_arch = "wasm32")]
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure};
     use gloo::utils::document;
     use js_sys::Reflect;
+    use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure};
+
+    use super::*;
 
     wasm_bindgen_test_configure!(run_in_browser);
 
     fn create_element() -> (Element, BSubtree) {
-        let element = document().create_element("a").expect("failed to create element");
+        let element = document()
+            .create_element("a")
+            .expect("failed to create element");
         let btree = BSubtree::create_root(&element);
         (element, btree)
     }
 
     #[test]
     fn properties_are_set() {
-        let attrs = Attributes::Static(&[
-            ["href", "https://example.com/"],
-            ["alt", "somewhere"],
-        ]);
+        let attrs = Attributes::Static(&[["href", "https://example.com/"], ["alt", "somewhere"]]);
         let (element, btree) = create_element();
         attrs.apply(&btree, &element);
         assert_eq!(
-            Reflect::get(element.as_ref(), &JsValue::from_str("href")).expect("no href").as_string().expect("not a string"),
+            Reflect::get(element.as_ref(), &JsValue::from_str("href"))
+                .expect("no href")
+                .as_string()
+                .expect("not a string"),
             "https://example.com/",
             "property `href` not set properly"
         );
         assert_eq!(
-            Reflect::get(element.as_ref(), &JsValue::from_str("alt")).expect("no alt").as_string().expect("not a string"),
+            Reflect::get(element.as_ref(), &JsValue::from_str("alt"))
+                .expect("no alt")
+                .as_string()
+                .expect("not a string"),
             "somewhere",
             "property `alt` not set properly"
         );
@@ -304,10 +310,7 @@ mod tests {
 
     #[test]
     fn class_id_are_attrs() {
-        let attrs = Attributes::Static(&[
-            ["id", "foo"],
-            ["class", "thing"],
-        ]);
+        let attrs = Attributes::Static(&[["id", "foo"], ["class", "thing"]]);
         let (element, btree) = create_element();
         attrs.apply(&btree, &element);
         assert_eq!(element.get_attribute("id").unwrap(), "foo");
diff --git a/packages/yew/src/dom_bundle/btag/mod.rs b/packages/yew/src/dom_bundle/btag/mod.rs
index 5463a4e875c..7d44ff99301 100644
--- a/packages/yew/src/dom_bundle/btag/mod.rs
+++ b/packages/yew/src/dom_bundle/btag/mod.rs
@@ -386,7 +386,7 @@ mod feat_hydration {
 #[cfg(test)]
 mod tests {
     use gloo::utils::document;
-    use wasm_bindgen::JsCast;
+    use wasm_bindgen::{JsCast, JsValue};
     use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure};
     use web_sys::HtmlInputElement as InputElement;
 
@@ -932,7 +932,7 @@ mod tests {
     }
 
     // test for bug: https://github.com/yewstack/yew/pull/2653
-    // #[test]
+    #[test]
     fn test_index_map_attribute_diff() {
         let (root, scope, parent) = setup_parent();
 
@@ -969,8 +969,20 @@ mod tests {
                 .dyn_ref::<web_sys::Element>()
                 .unwrap()
                 .outer_html(),
-            "<div tabindex=\"0\"></div>"
-        )
+            "<div></div>"
+        );
+
+        assert_eq!(
+            js_sys::Reflect::get(
+                test_ref.get().unwrap().as_ref(),
+                &JsValue::from_str("tabindex")
+            )
+            .expect("no tabindex")
+            .as_string()
+            .expect("not a string"),
+            "0",
+            "property `tabindex` not set properly"
+        );
     }
 }