Skip to content

LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust

test(ui): wait for menu registration and visible sync rows

sanyamsingh001089172137b49
diff --git a/crates/ui-egui/src/tests_menubar.rs b/crates/ui-egui/src/tests_menubar.rs
index 8fbc13608..758ac595a 100644
--- a/crates/ui-egui/src/tests_menubar.rs
+++ b/crates/ui-egui/src/tests_menubar.rs
@@ -116,6 +116,7 @@ fn hovering_another_title_switches_the_open_menu() {
#[test]
fn clicking_another_title_opens_it_in_one_click() {
let mut h = app([1280.0, 703.0]);
+ assert!(h.step_until(SETTLE, |h| widget(h, "menu:Edit").is_some()), "Edit menu title was not registered");
go(&mut h, "ui.clickWidget", "menu:Edit");
assert_eq!(open_menu(&h).as_deref(), Some("menu:Edit"));
// move away from the titles first so only the click can be what switches
diff --git a/crates/ui-egui/src/tests_sync.rs b/crates/ui-egui/src/tests_sync.rs
index 9e0db5297..379f176c0 100644
--- a/crates/ui-egui/src/tests_sync.rs
+++ b/crates/ui-egui/src/tests_sync.rs
@@ -84,8 +84,24 @@ fn open_and_scan(h: &mut Headless, folder: &str) {
// the rows above it hold one folder each and open by themselves
let row = format!("source:libfolder:{folder}");
assert!(h.step_until(T, |h| h.app.widgets.iter().any(|(w, _)| *w == row)), "no row {row}");
+ let before = h.app.widgets.iter().find(|(w, _)| *w == row).map(|(_, r)| *r).unwrap_or_else(|| panic!("no row {row}"));
+ let panel = h.app.widgets.iter().find(|(w, _)| w == "panel:left_panel").map(|(_, r)| *r).expect("left panel");
+ // Off-screen rows are registered too. Preserve the default layout when this row is already visible.
+ let before_visible = before.intersect(panel);
+ let before_drawn = h.app.widgets.iter().any(|(w, _)| *w == format!("label:libfolder:{folder}"));
+ if !before_drawn || !before_visible.is_positive() || before_visible.height() < before.height() - 0.5 {
+ crate::tests_panels::scroll_sidebar(h, panel.center().y - before.center().y);
+ }
let rect = h.app.widgets.iter().find(|(w, _)| *w == row).map(|(_, r)| *r).unwrap_or_else(|| panic!("no row {row}"));
- let c = rect.center();
+ let panel = h.app.widgets.iter().find(|(w, _)| w == "panel:left_panel").map(|(_, r)| *r).expect("left panel");
+ let visible = rect.intersect(panel);
+ let c = visible.center();
+ let drawn = h.app.widgets.iter().any(|(w, _)| *w == format!("label:libfolder:{folder}"));
+ let clips: Vec<_> = h.view.shapes.iter().filter(|s| s.shape.visual_bounding_rect().intersects(rect)).map(|s| s.clip_rect).collect();
+ assert!(
+ drawn && visible.is_positive() && visible.height() >= rect.height() - 0.5,
+ "folder row must be drawn and vertically in view: before={before:?} row={rect:?} panel={panel:?} visible={visible:?} click={c:?} drawn={drawn} paint_clips={clips:?}"
+ );
let r = h.request("ui.click", json!({"x": c.x, "y": c.y, "button": "right"}), T);
assert_eq!(r["ok"], true, "{r}");
h.step();