refactor: remove stale input map logic from App + add tests

Author: alexpasmantier

television/app.rs

@@ -608,18 +608,12 @@ impl App {
                     self.action_tx.send(action)?;
                 }
 
-                // Update keymap if channel changed (remote control to channel mode transition)
-                // This ensures channel-specific keybindings are properly loaded
+                // Update watch timer and history
                 if was_remote_control
                     && matches!(action, Action::ConfirmSelection)
                     && self.television.mode == Mode::Channel
+                    || matches!(action, Action::SwitchToChannel(_))
                 {
-                    self.update_input_map();
-                    self.update_history();
-                    self.restart_watch_timer();
-                } else if matches!(action, Action::SwitchToChannel(_)) {
-                    // Channel changed via shortcut, refresh keymap and watch timer
-                    self.update_input_map();
                     self.update_history();
                     self.restart_watch_timer();
                 }

tests/channels.rs

@@ -48,3 +48,24 @@ test_channel! {
     test_channel_text: "text",
     test_channel_diff: "git-diff",
 }
+
+#[test]
+fn test_channel_shortcuts() {
+    let mut tester = PtyTester::new();
+    let mut child = tester
+        .spawn_command_tui(tv_local_config_and_cable_with_args(&["files"]));
+
+    tester.assert_tui_frame_contains("CHANNEL  files");
+
+    // switch to the "dirs" channel
+    tester.send(&f(2));
+    tester.assert_tui_frame_contains("CHANNEL  dirs");
+
+    // switch back to the "files" channel
+    tester.send(&f(1));
+    tester.assert_tui_frame_contains("CHANNEL  files");
+
+    // Send Ctrl-C to exit
+    tester.send(&ctrl('c'));
+    PtyTester::assert_exit_ok(&mut child, DEFAULT_DELAY * 2);
+}

tests/common/mod.rs

@@ -339,6 +339,28 @@ pub fn ctrl(c: char) -> String {
     ((c as u8 & 0x1F) as char).to_string()
 }
 
+pub fn f(c: u8) -> String {
+    let seq = match c {
+        1 => "\x1bOP",    // F1
+        2 => "\x1bOQ",    // F2
+        3 => "\x1bOR",    // F3
+        4 => "\x1bOS",    // F4
+        5 => "\x1b[15~",  // F5
+        6 => "\x1b[17~",  // F6
+        7 => "\x1b[18~",  // F7
+        8 => "\x1b[19~",  // F8
+        9 => "\x1b[20~",  // F9
+        10 => "\x1b[21~", // F10
+        11 => "\x1b[23~", // F11
+        12 => "\x1b[24~", // F12
+        _ => {
+            panic!("Invalid function key: {}", c);
+        }
+    };
+
+    seq.to_string()
+}
+
 pub const ENTER: &str = "\r";
 pub const ESC: &str = "\x1b";