From 2b257d426f5e98219cdd6ac191d259b74a31d87e Mon Sep 17 00:00:00 2001
From: Craig Jennings <c@cjennings.net>
Date: Sat, 20 Jun 2026 12:06:37 -0400
Subject: refactor(mail-config): build the account-nav keymaps from one
 template

The cmail/dmail/gmail navigation maps were three near-identical defvar-keymap blocks differing only by maildir prefix, with the unread/flagged/large query clauses repeated in each. Add cj/--mail-account-search-queries (account -> the four search strings) and cj/--mail-make-account-map (builds the keymap), wrapped in eval-and-compile so org-msg's :preface can call the builder during byte-compilation. The three maps become one-line builder calls. Adds direct coverage of the query strings and the per-account closures.
---
 tests/test-mail-config--account-search-queries.el | 53 +++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 tests/test-mail-config--account-search-queries.el

(limited to 'tests')

diff --git a/tests/test-mail-config--account-search-queries.el b/tests/test-mail-config--account-search-queries.el
new file mode 100644
index 000000000..9f1b6b3e6
--- /dev/null
+++ b/tests/test-mail-config--account-search-queries.el
@@ -0,0 +1,53 @@
+;;; test-mail-config--account-search-queries.el --- Tests for the mail account-nav helpers -*- lexical-binding: t; -*-
+
+;;; Commentary:
+;; cj/--mail-account-search-queries (pure: account name -> the four mu4e search
+;; strings) and cj/--mail-make-account-map (builds the per-account nav keymap)
+;; replace three near-identical defvar-keymap blocks that differed only by
+;; maildir prefix.  The map test invokes each binding with mu4e-search mocked,
+;; which also verifies each loop-built closure captured its own query.
+
+;;; Code:
+
+(require 'ert)
+(require 'cl-lib)
+
+(add-to-list 'load-path (expand-file-name "modules" user-emacs-directory))
+(require 'mail-config)
+
+(ert-deftest test-mail-account-search-queries-cmail ()
+  "Normal: the four searches are scoped to the account's INBOX maildir."
+  (should (equal (cj/--mail-account-search-queries "cmail")
+                 '(("i" . "maildir:/cmail/INBOX")
+                   ("u" . "maildir:/cmail/INBOX AND flag:unread AND NOT flag:trashed")
+                   ("s" . "maildir:/cmail/INBOX AND flag:flagged")
+                   ("l" . "maildir:/cmail/INBOX AND size:5M..999M")))))
+
+(ert-deftest test-mail-account-search-queries-prefix-varies ()
+  "Boundary: only the maildir prefix changes between accounts."
+  (should (equal (cdr (assoc "i" (cj/--mail-account-search-queries "dmail")))
+                 "maildir:/dmail/INBOX"))
+  (should (equal (cdr (assoc "i" (cj/--mail-account-search-queries "gmail")))
+                 "maildir:/gmail/INBOX")))
+
+(ert-deftest test-mail-make-account-map-binds-four-keys ()
+  "Normal: the built keymap binds i/u/s/l to commands."
+  (let ((map (cj/--mail-make-account-map "cmail")))
+    (dolist (key '("i" "u" "s" "l"))
+      (should (commandp (keymap-lookup map key))))))
+
+(ert-deftest test-mail-make-account-map-closures-capture-distinct-queries ()
+  "Normal: each binding runs its own account-scoped search (no closure leak).
+mu4e-search is mocked to capture the query each command passes."
+  (let ((searched '()))
+    (cl-letf (((symbol-function 'mu4e-search)
+               (lambda (q) (push q searched))))
+      (let ((map (cj/--mail-make-account-map "dmail")))
+        (funcall (keymap-lookup map "i"))
+        (funcall (keymap-lookup map "u"))))
+    (should (member "maildir:/dmail/INBOX" searched))
+    (should (member "maildir:/dmail/INBOX AND flag:unread AND NOT flag:trashed"
+                    searched))))
+
+(provide 'test-mail-config--account-search-queries)
+;;; test-mail-config--account-search-queries.el ends here
-- 
cgit v1.2.3