From ff409bcb90d0fdf30a9833c6c1ec9ec815b5615a Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sun, 8 Nov 2026 15:16:45 -0800 Subject: [PATCH] Tests: the filter plug-in shortcut test accepts the macOS chord text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit each_filter_plugin_takes_a_shortcut_of_its_own required the exported row to end in "+Alt+Shift+F7". Export Text writes each shortcut as the dialog shows it, which is "⌥⇧⌘F7" on macOS, so the test failed there. The test now compares the row with menus::pretty_shortcut, as export_text_lists_the_dialogs_rows_with_their_shortcuts does. --- crates/ui-egui/src/shortcuts/tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/ui-egui/src/shortcuts/tests.rs b/crates/ui-egui/src/shortcuts/tests.rs index cdbdeeeba..d02576fd1 100644 --- a/crates/ui-egui/src/shortcuts/tests.rs +++ b/crates/ui-egui/src/shortcuts/tests.rs @@ -2566,7 +2566,7 @@ fn each_filter_plugin_takes_a_shortcut_of_its_own() { let lines: Vec<&str> = text.lines().filter(|l| l.starts_with("Object › Plug-ins › Same Name")).collect(); assert_eq!(lines.len(), 2, "{text}"); assert_eq!(lines[0], "Object › Plug-ins › Same Name\t"); - assert!(lines[1].starts_with("Object › Plug-ins › Same Name…\t") && lines[1].ends_with("+Alt+Shift+F7"), "{}", lines[1]); + assert_eq!(lines[1], format!("Object › Plug-ins › Same Name…\t{}", crate::menus::pretty_shortcut(chord))); // A chord an Effect menu item holds is a conflict. crate::keymap::set_override(&mut app.ui.shortcut_overrides, "effect:distort.transform", "Cmd+Alt+Shift+F8"); let conflicts = crate::shortcut_editor::conflicts_with(&app.ui.shortcut_overrides, "Cmd+Alt+Shift+F8", &key_one);