LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
Batch 28: resolve the leftover #685 test conflict in tests_panels.rs (both album tests kept)
Claude2efa01767fe3
diff --git a/crates/ui-egui/src/tests_panels.rs b/crates/ui-egui/src/tests_panels.rsindex f9f93359f..cdf24dadd 100644--- a/crates/ui-egui/src/tests_panels.rs+++ b/crates/ui-egui/src/tests_panels.rs@@ -1183,7 +1183,6 @@ fn the_tracklog_toast_shows_after_a_while() {let _ = std::fs::remove_dir_all(&dir);}-<<<<<<< HEAD/// Issue #678: Settings ▸ Faces cannot switch recognition on until a recognition model is chosen:/// the box is off and clicking it changes nothing. Installing a model switches recognition on by/// itself, and from then on the box turns it off and on.@@ -1255,35 +1254,15 @@ fn local_photos_cannot_be_added_to_albums_until_they_join_my_photos() {let thumb = widget(&h, &format!("thumb:{}", local.0));// right-click: Add to Album is there but off, so hovering opens no album entries-=======-/// Issue #676: right-click ▸ Add to Album offers New Album… like the Photo menu does, also when-/// the library has no album yet (the submenu used to come up empty); the new album holds the photo.-#[test]-fn right_click_add_to_album_offers_a_new_album_when_there_is_none() {- let mut h = demo([1400.0, 900.0], json!({"view": "photoGrid", "leftPanel": true}));- let plain: Vec<u64> = h.app.session.catalog.albums().filter(|a| !a.folder && !a.is_smart()).map(|a| a.id.0).collect();- for id in plain {- h.app.session.execute("album.delete", &json!({"id": id})).unwrap();- }- assert!(h.app.session.catalog.albums().all(|a| a.folder || a.is_smart()), "no plain album is left");- let photo = lightcraft_catalog::PhotoId(h.app.session.visible_cloned()[1].0);- h.step();- let thumb = widget(&h, &format!("thumb:{}", photo.0));->>>>>>> pr/685let r = h.request("ui.click", json!({"x": thumb.center().x, "y": thumb.center().y, "button": "right"}), T);assert_eq!(r["ok"], true, "{r}");h.step();h.step();-<<<<<<< HEADassert!(h.app.session.selection.contains(local));-=======- assert!(h.app.session.selection.contains(photo), "right-click selects the photo");->>>>>>> pr/685let r = h.request("ui.hoverWidget", json!({"id": "button:contextAddToAlbum"}), T);assert_eq!(r["ok"], true, "{r}");h.step();h.step();-<<<<<<< HEADassert!(!h.app.widgets.iter().any(|(w, _)| w.starts_with("button:contextAlbum:")), "the submenu must not open for a Local photo");let r = h.request("ui.key", json!({"key": "Escape"}), T);assert_eq!(r["ok"], true, "{r}");@@ -1344,7 +1323,30 @@ fn right_click_add_to_album_offers_a_new_album_when_there_is_none() {h.step();assert_eq!(h.app.session.catalog.album(album_id).unwrap().photos, vec![local]);let _ = std::fs::remove_dir_all(&dir);-=======+}++/// Issue #676: right-click ▸ Add to Album offers New Album… like the Photo menu does, also when+/// the library has no album yet (the submenu used to come up empty); the new album holds the photo.+#[test]+fn right_click_add_to_album_offers_a_new_album_when_there_is_none() {+ let mut h = demo([1400.0, 900.0], json!({"view": "photoGrid", "leftPanel": true}));+ let plain: Vec<u64> = h.app.session.catalog.albums().filter(|a| !a.folder && !a.is_smart()).map(|a| a.id.0).collect();+ for id in plain {+ h.app.session.execute("album.delete", &json!({"id": id})).unwrap();+ }+ assert!(h.app.session.catalog.albums().all(|a| a.folder || a.is_smart()), "no plain album is left");+ let photo = lightcraft_catalog::PhotoId(h.app.session.visible_cloned()[1].0);+ h.step();+ let thumb = widget(&h, &format!("thumb:{}", photo.0));+ let r = h.request("ui.click", json!({"x": thumb.center().x, "y": thumb.center().y, "button": "right"}), T);+ assert_eq!(r["ok"], true, "{r}");+ h.step();+ h.step();+ assert!(h.app.session.selection.contains(photo), "right-click selects the photo");+ let r = h.request("ui.hoverWidget", json!({"id": "button:contextAddToAlbum"}), T);+ assert_eq!(r["ok"], true, "{r}");+ h.step();+ h.step();let r = h.request("ui.clickWidget", json!({"id": "button:contextNewAlbum"}), T);assert_eq!(r["ok"], true, "{r}");h.step();@@ -1361,5 +1363,4 @@ fn right_click_add_to_album_offers_a_new_album_when_there_is_none() {let trip = h.app.session.catalog.albums().find(|a| a.name == "Trip").expect("the album was created");assert!(trip.photos.contains(&photo), "the right-clicked photo is in it: {:?}", trip.photos);assert!(h.app.ui.dialog.is_none(), "{:?}", h.app.ui.dialog);->>>>>>> pr/685}