aboutsummaryrefslogtreecommitdiff
path: root/tests/test-term-toggle--buffer-filter.el
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test-term-toggle--buffer-filter.el')
-rw-r--r--tests/test-term-toggle--buffer-filter.el59
1 files changed, 34 insertions, 25 deletions
diff --git a/tests/test-term-toggle--buffer-filter.el b/tests/test-term-toggle--buffer-filter.el
index 2c96ecb38..f56459a06 100644
--- a/tests/test-term-toggle--buffer-filter.el
+++ b/tests/test-term-toggle--buffer-filter.el
@@ -1,11 +1,12 @@
;;; test-term-toggle--buffer-filter.el --- Tests for F12's buffer filter -*- lexical-binding: t; -*-
;;; Commentary:
-;; Three closely-related helpers determine which terminal buffers F12
-;; manages: the predicate `cj/--term-toggle-buffer-p', the MRU list
+;; Three closely-related helpers determine which terminal buffer F12
+;; manages: the predicate `cj/--term-toggle-buffer-p', the list
;; `cj/--term-toggle-buffers', and the per-frame window finder
-;; `cj/--term-toggle-displayed-window'. All three exclude agent-
-;; prefixed buffers so agent has its own F9 surface.
+;; `cj/--term-toggle-displayed-window'. F12 opens eshell (run through EAT via
+;; eat-eshell-mode), so it manages eshell-mode buffers. Standalone eat buffers
+;; and ai-term's agent buffers (also eat) are NOT F12-managed.
;;; Code:
@@ -13,32 +14,40 @@
(add-to-list 'load-path (expand-file-name "modules" user-emacs-directory))
(add-to-list 'load-path (expand-file-name "tests" user-emacs-directory))
-(require 'term-config)
-(require 'testutil-ghostel-buffers)
+(require 'eat-config)
+(require 'testutil-terminal-buffers)
(defun test-term-toggle--cleanup ()
"Kill leftover agent- and *test-term- prefixed buffers."
(cj/test--kill-agent-buffers)
(cj/test--kill-test-term-buffers))
-(ert-deftest test-term-toggle--buffer-p-accepts-ghostel-mode ()
- "Normal: a ghostel-mode buffer with non-agent name qualifies."
+(ert-deftest test-term-toggle--buffer-p-accepts-eshell-mode ()
+ "Normal: an eshell-mode buffer qualifies as the F12 terminal."
(test-term-toggle--cleanup)
- (let ((buf (cj/test--make-fake-ghostel-buffer "*test-term-1*")))
+ (let ((buf (cj/test--make-fake-eshell-buffer "*test-term-1*")))
(unwind-protect
(should (cj/--term-toggle-buffer-p buf))
(kill-buffer buf))))
+(ert-deftest test-term-toggle--buffer-p-rejects-eat ()
+ "Boundary: a standalone eat buffer is NOT F12-managed (F12 opens eshell)."
+ (test-term-toggle--cleanup)
+ (let ((buf (cj/test--make-fake-eat-buffer "*test-term-eat*")))
+ (unwind-protect
+ (should-not (cj/--term-toggle-buffer-p buf))
+ (kill-buffer buf))))
+
(ert-deftest test-term-toggle--buffer-p-rejects-agent ()
- "Boundary: agent-prefixed terminal buffers are excluded from F12's set."
+ "Boundary: ai-term agent buffers are excluded from F12's set."
(test-term-toggle--cleanup)
- (let ((buf (cj/test--make-fake-ghostel-buffer "agent [project-a]")))
+ (let ((buf (cj/test--make-fake-eat-buffer "agent [project-a]")))
(unwind-protect
(should-not (cj/--term-toggle-buffer-p buf))
(kill-buffer buf))))
(ert-deftest test-term-toggle--buffer-p-rejects-non-terminal ()
- "Boundary: a regular buffer (not ghostel-mode, no terminal name prefix) -> nil."
+ "Boundary: a regular buffer (not eshell-mode) -> nil."
(test-term-toggle--cleanup)
(let ((buf (get-buffer-create "*test-term-regular*")))
(unwind-protect
@@ -48,40 +57,40 @@
(ert-deftest test-term-toggle--buffer-p-rejects-dead-buffer ()
"Boundary: nil and dead buffers -> nil."
(should-not (cj/--term-toggle-buffer-p nil))
- (let ((buf (cj/test--make-fake-ghostel-buffer "*test-term-dead*")))
+ (let ((buf (cj/test--make-fake-eshell-buffer "*test-term-dead*")))
(kill-buffer buf)
(should-not (cj/--term-toggle-buffer-p buf))))
-(ert-deftest test-term-toggle--buffers-filters-agent ()
- "Normal: returns terminal buffers but excludes agent-prefixed ones."
+(ert-deftest test-term-toggle--buffers-returns-eshell-excludes-others ()
+ "Normal: returns the eshell terminal but not eat/agent buffers."
(test-term-toggle--cleanup)
- (let ((normal (cj/test--make-fake-ghostel-buffer "*test-term-normal*"))
- (agent (cj/test--make-fake-ghostel-buffer "agent [for-test]")))
+ (let ((esh (cj/test--make-fake-eshell-buffer "*test-term-esh*"))
+ (agent (cj/test--make-fake-eat-buffer "agent [for-test]")))
(unwind-protect
(let ((result (cj/--term-toggle-buffers)))
- (should (memq normal result))
+ (should (memq esh result))
(should-not (memq agent result)))
- (kill-buffer normal)
+ (kill-buffer esh)
(kill-buffer agent))))
(ert-deftest test-term-toggle--displayed-window-finds-terminal ()
- "Normal: terminal in a window -> returns that window."
+ "Normal: the eshell terminal in a window -> returns that window."
(test-term-toggle--cleanup)
- (let ((vt (cj/test--make-fake-ghostel-buffer "*test-term-shown*")))
+ (let ((esh (cj/test--make-fake-eshell-buffer "*test-term-shown*")))
(unwind-protect
(save-window-excursion
(delete-other-windows)
(let ((win (split-window-right)))
- (set-window-buffer win vt)
+ (set-window-buffer win esh)
(let ((result (cj/--term-toggle-displayed-window)))
(should (windowp result))
- (should (eq (window-buffer result) vt)))))
- (kill-buffer vt))))
+ (should (eq (window-buffer result) esh)))))
+ (kill-buffer esh))))
(ert-deftest test-term-toggle--displayed-window-skips-agent ()
"Boundary: only an agent terminal is displayed -> nil (agent not F12-managed)."
(test-term-toggle--cleanup)
- (let ((agent (cj/test--make-fake-ghostel-buffer "agent [skip-test]")))
+ (let ((agent (cj/test--make-fake-eat-buffer "agent [skip-test]")))
(unwind-protect
(save-window-excursion
(delete-other-windows)