fix counters tests

leptos-rs · Jun 3, 2024 · 8f86409 · 8f86409
1 parent 83838d7
commit 8f86409
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 55 deletions.
diff --git a/examples/counters/Cargo.toml b/examples/counters/Cargo.toml
@@ -5,11 +5,10 @@ edition = "2021"
 
 [dependencies]
 leptos = { path = "../../leptos", features = ["csr"]  }
-log = "0.4"
-console_log = "1"
 console_error_panic_hook = "0.1.7"
 
 [dev-dependencies]
+gloo-timers = { version = "0.3", features = ["futures"] }
 wasm-bindgen-test = "0.3.0"
 wasm-bindgen = "0.2"
 web-sys = "0.3"
diff --git a/examples/counters/src/lib.rs b/examples/counters/src/lib.rs
@@ -1,5 +1,4 @@
-use leptos::prelude::signal::*;
-use leptos::prelude::*;
+use leptos::prelude::{signal::*, *};
 
 const MANY_COUNTERS: usize = 1000;
 

diff --git a/examples/counters/src/main.rs b/examples/counters/src/main.rs
@@ -1,8 +1,6 @@
 use counters::Counters;
-use leptos::prelude::*;
 
 fn main() {
-    _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
-    mount_to_body(|| view! { <Counters/> })
+    leptos::mount::mount_to_body(Counters)
 }
diff --git a/examples/counters/tests/web.rs b/examples/counters/tests/web.rs
@@ -3,46 +3,49 @@ use wasm_bindgen_test::*;
 
 wasm_bindgen_test_configure!(run_in_browser);
 use counters::Counters;
-use leptos::*;
+use gloo_timers::future::TimeoutFuture;
+use leptos::prelude::*;
 use web_sys::HtmlElement;
 
 #[wasm_bindgen_test]
-fn inc() {
-    mount_to_body(|| view! { <Counters/> });
+async fn inc() {
+    mount_to_body(Counters);
 
-    let document = leptos::document();
+    let document = document();
     let div = document.query_selector("div").unwrap().unwrap();
     let add_counter = div
         .first_child()
         .unwrap()
         .dyn_into::<HtmlElement>()
         .unwrap();
 
+    assert_eq!(
+        div.inner_html(),
+        "<button>Add Counter</button><button>Add 1000 \
+         Counters</button><button>Clear Counters</button><p>Total: \
+         <span>0</span> from <span>0</span> counters.</p><ul></ul>"
+    );
+
     // add 3 counters
     add_counter.click();
     add_counter.click();
     add_counter.click();
 
+    TimeoutFuture::new(10).await;
+
     // check HTML
     assert_eq!(
         div.inner_html(),
         "<button>Add Counter</button><button>Add 1000 \
-         Counters</button><button>Clear Counters</button><p>Total: <span><!-- \
-         <DynChild> -->0<!-- </DynChild> --></span> from <span><!-- \
-         <DynChild> -->3<!-- </DynChild> --></span> counters.</p><ul><!-- \
-         <Each> --><!-- <EachItem> --><!-- <Counter> \
-         --><li><button>-1</button><input type=\"text\"><span><!-- <DynChild> \
-         -->0<!-- </DynChild> \
-         --></span><button>+1</button><button>x</button></li><!-- </Counter> \
-         --><!-- </EachItem> --><!-- <EachItem> --><!-- <Counter> \
-         --><li><button>-1</button><input type=\"text\"><span><!-- <DynChild> \
-         -->0<!-- </DynChild> \
-         --></span><button>+1</button><button>x</button></li><!-- </Counter> \
-         --><!-- </EachItem> --><!-- <EachItem> --><!-- <Counter> \
-         --><li><button>-1</button><input type=\"text\"><span><!-- <DynChild> \
-         -->0<!-- </DynChild> \
-         --></span><button>+1</button><button>x</button></li><!-- </Counter> \
-         --><!-- </EachItem> --><!-- </Each> --></ul>"
+         Counters</button><button>Clear Counters</button><p>Total: \
+         <span>0</span> from <span>3</span> \
+         counters.</p><ul><li><button>-1</button><input \
+         type=\"text\"><span>0</span><button>+1</button><button>x</button></\
+         li><li><button>-1</button><input \
+         type=\"text\"><span>0</span><button>+1</button><button>x</button></\
+         li><li><button>-1</button><input \
+         type=\"text\"><span>0</span><button>+1</button><button>x</button></\
+         li></ul>"
     );
 
     let counters = div
@@ -71,25 +74,20 @@ fn inc() {
         }
     }
 
+    TimeoutFuture::new(10).await;
+
     assert_eq!(
         div.inner_html(),
         "<button>Add Counter</button><button>Add 1000 \
-         Counters</button><button>Clear Counters</button><p>Total: <span><!-- \
-         <DynChild> -->6<!-- </DynChild> --></span> from <span><!-- \
-         <DynChild> -->3<!-- </DynChild> --></span> counters.</p><ul><!-- \
-         <Each> --><!-- <EachItem> --><!-- <Counter> \
-         --><li><button>-1</button><input type=\"text\"><span><!-- <DynChild> \
-         -->1<!-- </DynChild> \
-         --></span><button>+1</button><button>x</button></li><!-- </Counter> \
-         --><!-- </EachItem> --><!-- <EachItem> --><!-- <Counter> \
-         --><li><button>-1</button><input type=\"text\"><span><!-- <DynChild> \
-         -->2<!-- </DynChild> \
-         --></span><button>+1</button><button>x</button></li><!-- </Counter> \
-         --><!-- </EachItem> --><!-- <EachItem> --><!-- <Counter> \
-         --><li><button>-1</button><input type=\"text\"><span><!-- <DynChild> \
-         -->3<!-- </DynChild> \
-         --></span><button>+1</button><button>x</button></li><!-- </Counter> \
-         --><!-- </EachItem> --><!-- </Each> --></ul>"
+         Counters</button><button>Clear Counters</button><p>Total: \
+         <span>6</span> from <span>3</span> \
+         counters.</p><ul><li><button>-1</button><input \
+         type=\"text\"><span>1</span><button>+1</button><button>x</button></\
+         li><li><button>-1</button><input \
+         type=\"text\"><span>2</span><button>+1</button><button>x</button></\
+         li><li><button>-1</button><input \
+         type=\"text\"><span>3</span><button>+1</button><button>x</button></\
+         li></ul>"
     );
 
     // remove the first counter
@@ -101,20 +99,17 @@ fn inc() {
         .unchecked_into::<HtmlElement>()
         .click();
 
+    TimeoutFuture::new(10).await;
+
     assert_eq!(
         div.inner_html(),
         "<button>Add Counter</button><button>Add 1000 \
-         Counters</button><button>Clear Counters</button><p>Total: <span><!-- \
-         <DynChild> -->5<!-- </DynChild> --></span> from <span><!-- \
-         <DynChild> -->2<!-- </DynChild> --></span> counters.</p><ul><!-- \
-         <Each> --><!-- <EachItem> --><!-- <EachItem> --><!-- <Counter> \
-         --><li><button>-1</button><input type=\"text\"><span><!-- <DynChild> \
-         -->2<!-- </DynChild> \
-         --></span><button>+1</button><button>x</button></li><!-- </Counter> \
-         --><!-- </EachItem> --><!-- <EachItem> --><!-- <Counter> \
-         --><li><button>-1</button><input type=\"text\"><span><!-- <DynChild> \
-         -->3<!-- </DynChild> \
-         --></span><button>+1</button><button>x</button></li><!-- </Counter> \
-         --><!-- </EachItem> --><!-- </Each> --></ul>"
+         Counters</button><button>Clear Counters</button><p>Total: \
+         <span>5</span> from <span>2</span> \
+         counters.</p><ul><li><button>-1</button><input \
+         type=\"text\"><span>2</span><button>+1</button><button>x</button></\
+         li><li><button>-1</button><input \
+         type=\"text\"><span>3</span><button>+1</button><button>x</button></\
+         li></ul>"
     );
 }