fix: flush

Author: Madoshakalaka

Cargo.lock

@@ -42,11 +42,13 @@ jemallocator = "0.5"
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
 wasm-bindgen-test.workspace = true
+wasm-bindgen.workspace = true
+web-sys = { workspace = true }
 gloo = { workspace = true }
 ssr-e2e-harness = { path = "../../tools/ssr-e2e-harness" }
 
 [dev-dependencies]
-yew = { path = "../../packages/yew", features = ["hydration"] }
+yew = { path = "../../packages/yew", features = ["hydration", "test"] }
 yew-link = { path = "../../packages/yew-link", features = ["hydration"] }
 
 [features]

examples/ssr_router/Cargo.toml

@@ -2,10 +2,11 @@
 
 use gloo::utils::document;
 use ssr_e2e_harness::{
-    clear_resource_timings, fetch_ssr_html, navigate, output_element, resource_request_count,
-    setup_ssr_page, wait_for,
+    clear_resource_timings, fetch_ssr_html, output_element, resource_request_count, setup_ssr_page,
+    wait_for,
 };
 use ssr_router::{App, AppProps, LINK_ENDPOINT};
+use wasm_bindgen::JsCast;
 use wasm_bindgen_test::*;
 use yew::Renderer;
 
@@ -90,13 +91,18 @@ async fn ssr_hydration_and_client_navigation() {
 
     // -- Part 2: Navigate to /posts within the same app, then to /posts/0 --
 
-    // Yield to ensure effects (router history listener) are registered.
-    gloo::timers::future::sleep(std::time::Duration::from_millis(500)).await;
+    yew::scheduler::flush().await;
 
     clear_resource_timings();
 
-    // Navigate to /posts first, then to /posts/0 to trigger a client-side fetch.
-    navigate("/posts");
+    let posts_link: web_sys::HtmlElement = output_element()
+        .query_selector("a.navbar-item[href='/posts']")
+        .unwrap()
+        .expect("Posts navbar link should exist")
+        .dyn_into()
+        .unwrap();
+    posts_link.click();
+    yew::scheduler::flush().await;
 
     wait_for(
         || {
@@ -114,7 +120,27 @@ async fn ssr_hydration_and_client_navigation() {
 
     clear_resource_timings();
 
-    navigate("/posts/0");
+    wait_for(
+        || {
+            output_element()
+                .query_selector("a.title.is-block[href='/posts/0']")
+                .ok()
+                .flatten()
+                .is_some()
+        },
+        15000,
+        "post 0 card link on posts list",
+    )
+    .await;
+
+    let post_link: web_sys::HtmlElement = output_element()
+        .query_selector("a.title.is-block[href='/posts/0']")
+        .unwrap()
+        .unwrap()
+        .dyn_into()
+        .unwrap();
+    post_link.click();
+    yew::scheduler::flush().await;
 
     wait_for(
         || {
@@ -153,7 +179,7 @@ async fn ssr_hydration_and_client_navigation() {
     );
 
     app.destroy();
-    output_element().set_inner_html("");
+    yew::scheduler::flush().await;
 }
 
 #[wasm_bindgen_test]
@@ -169,5 +195,5 @@ async fn hydrate_home() {
     .await;
 
     app.destroy();
-    output_element().set_inner_html("");
+    yew::scheduler::flush().await;
 }

examples/ssr_router/tests/e2e.rs

@@ -5,7 +5,6 @@ edition = "2021"
 
 [dependencies]
 gloo = { workspace = true, features = ["futures"] }
-gloo-history = "0.2"
 web-sys = { workspace = true }
 wasm-bindgen = { workspace = true }
 js-sys = { workspace = true }

tools/ssr-e2e-harness/Cargo.toml

@@ -58,25 +58,6 @@ pub fn push_route(path: &str) {
         .unwrap();
 }
 
-/// Triggers in-app navigation by pushing a route onto gloo-history's
-/// `BrowserHistory` singleton, which calls `pushState` and then directly
-/// invokes all registered history callbacks.
-///
-/// HtmlElement.click() on `<a>` in headless Firefox triggers real browser
-/// navigation, crashing the test runner. Yew's capture-phase event delegation
-/// cannot prevent it in the wasm-bindgen-test context.
-///
-/// Dispatching a synthetic `PopStateEvent` on `window` also does not work
-/// reliably: `pushState` does not fire `popstate` natively, and while
-/// gloo-history registers a popstate listener, tests have shown it does not
-/// pick up synthetic events consistently across browsers. The reliable approach
-/// is to use `BrowserHistory::push()` directly, which calls `notify_callbacks()`
-/// internally and is the same codepath as yew-router's `<Link>` component.
-pub fn navigate(path: &str) {
-    use gloo_history::History;
-    gloo_history::BrowserHistory::new().push(path);
-}
-
 fn window_js() -> JsValue {
     web_sys::window().unwrap().into()
 }