1 files changed, 45 insertions, 24 deletions

diff --git a/tests/test-org-agenda-config-display.el b/tests/test-org-agenda-config-display.el
index af4c7ea0..f039985d 100644
--- a/tests/test-org-agenda-config-display.el
+++ b/tests/test-org-agenda-config-display.el
@@ -2,6 +2,8 @@
 
 ;;; Commentary:
 ;; Tests for the display-buffer rule used by the F8 org agenda view.
+;; The agenda takes the whole frame; these pin that, and pin the two ways
+;; it previously failed to (a fraction of the frame, or shrunk to fit).
 
 ;;; Code:
 
@@ -10,39 +12,58 @@
 (add-to-list 'load-path (expand-file-name "modules" user-emacs-directory))
 (require 'org-agenda-config)
 
-(ert-deftest test-org-agenda-config-display-rule-uses-configured-height ()
-  "Normal: the agenda display rule uses the configured frame fraction."
-  (let ((cj/org-agenda-window-height 0.75))
-    (should (equal (cdr (assoc 'window-height
-                               (cddr (cj/--org-agenda-display-rule))))
-                   0.75))))
+(defun test-org-agenda-config-display--actions ()
+  "Return the display-action function list from the agenda rule."
+  (car (cdr (cj/--org-agenda-display-rule))))
+
+(defun test-org-agenda-config-display--alist ()
+  "Return the action alist from the agenda rule."
+  (cddr (cj/--org-agenda-display-rule)))
+
+(ert-deftest test-org-agenda-config-display-rule-takes-full-frame ()
+  "Normal: the agenda display rule claims the whole frame."
+  (should (memq 'display-buffer-full-frame
+                (test-org-agenda-config-display--actions))))
+
+(ert-deftest test-org-agenda-config-display-rule-reuses-agenda-window ()
+  "Normal: an agenda already on screen is reused rather than re-displayed."
+  (should (memq 'display-buffer-reuse-mode-window
+                (test-org-agenda-config-display--actions))))
+
+(ert-deftest test-org-agenda-config-display-rule-sets-no-window-height ()
+  "Regression: no height fraction survives.
+The rule used to hand the agenda 0.75 of the frame; a leftover
+`window-height' entry would cap the full-frame window right back down."
+  (should-not (assoc 'window-height (test-org-agenda-config-display--alist))))
 
 (ert-deftest test-org-agenda-config-display-rule-does-not-fit-to-buffer ()
   "Regression: F8 agenda should not shrink to fit compact agenda contents."
-  (let ((cj/org-agenda-window-height 0.75))
-    (should-not (eq (cdr (assoc 'window-height
-                                (cddr (cj/--org-agenda-display-rule))))
-                    'fit-window-to-buffer))))
-
-(ert-deftest test-org-agenda-config-display-rule-creates-large-window ()
-  "Integration: the agenda rule creates a window near the configured height."
-  (let ((cj/org-agenda-window-height 0.75)
-        (display-buffer-alist (list (cj/--org-agenda-display-rule)))
+  (should-not (eq (cdr (assoc 'window-height
+                              (test-org-agenda-config-display--alist)))
+                  'fit-window-to-buffer)))
+
+(ert-deftest test-org-agenda-config-display-rule-window-not-dedicated ()
+  "Regression: the agenda window must not be dedicated.
+With the agenda owning the only window, a dedicated one leaves RET on an
+item (`org-agenda-switch-to') nowhere to put the file, so it splits or
+opens a frame instead of replacing the agenda."
+  (should-not (cdr (assoc 'dedicated (test-org-agenda-config-display--alist)))))
+
+(ert-deftest test-org-agenda-config-display-rule-creates-sole-window ()
+  "Integration: displaying the agenda leaves it as the frame's only window."
+  (let ((display-buffer-alist (list (cj/--org-agenda-display-rule)))
         (buffer (get-buffer-create "*Org Agenda*")))
     (unwind-protect
         (save-window-excursion
           (delete-other-windows)
+          (split-window-below)
           (with-current-buffer buffer
             (erase-buffer)
-            (dotimes (_ 3)
-              (insert "agenda line\n")))
-          (let* ((before-height (window-total-height))
-                 (window (display-buffer buffer))
-                 (actual-ratio (/ (float (window-total-height window))
-                                  before-height)))
-            (should (= 2 (length (window-list))))
-            (should (> actual-ratio 0.65))
-            (should (< actual-ratio 0.85))))
+            (dotimes (_ 3) (insert "agenda line\n")))
+          (let ((window (display-buffer buffer)))
+            (should (= 1 (length (window-list))))
+            (should (eq window (car (window-list))))
+            (should (eq (window-buffer window) buffer))))
       (kill-buffer buffer))))
 
 (provide 'test-org-agenda-config-display)