Skip to content

Use vertico-mode command to control if mode is active #973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matsl merged 1 commit into from
Jun 11, 2026
Merged

Use vertico-mode command to control if mode is active #973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
2026-06-10 Mats Lidell <matsl@gnu.org>

* test/hywiki-tests.el (hywiki-tests--referent-test): Disable
vertico-mode during the test if active.
(hywiki-tests--save-referent-command-use-menu):
(hywiki-tests--save-referent-find-use-menu): Do not set vertico-mode
in let.
(hywiki-tests--save-referent-info-node-use-menu): Change expected
results to match result without vertico-mode active. Test now passes
both when in docker and native.

2026-06-09 Mats Lidell <matsl@gnu.org>

* test/hbut-tests.el (hbut-tests--ibut-at-p-identifies-a-remote-pathname):
Expand Down
27 changes: 14 additions & 13 deletions test/hywiki-tests.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,21 @@ The template runs the PREPARE body, and that must add the HyWikiWord
named WikiReferent with a non-page referent type."
(declare (indent 0) (debug t))
`(let* ((hsys-consult-flag nil)
(vertico-mode 0)
(local-vertico-mode (bound-and-true-p vertico-mode))
(hywiki-directory (make-temp-file "hywiki" t))
(wiki-word-non-page "WikiReferent")
(mode-require-final-newline nil))
(unwind-protect
(save-excursion
(when local-vertico-mode
(vertico-mode -1))
(should (equal '() (hywiki-get-wikiword-list)))

,@prepare

(should (equal ,expected-referent (hywiki-get-referent wiki-word-non-page))))
(when local-vertico-mode
(vertico-mode))
(hy-delete-files-and-buffers (list (hywiki-cache-default-file)))
(hywiki-tests--delete-hywiki-dir-and-buffer hywiki-directory))))

Expand Down Expand Up @@ -1250,7 +1254,6 @@ Note special meaning of `hywiki-allow-plurals-flag'."
(ert-deftest hywiki-tests--referent-cache-test ()
"Test to check that a HyWiki referent read back from cache is as expected."
(let* ((hsys-consult-flag nil)
(vertico-mode 0)
(hywiki-directory (make-temp-file "hywiki" t))
(file (make-temp-file "hypb"))
(wiki-word-non-page "WikiReferent")
Expand Down Expand Up @@ -1343,9 +1346,8 @@ Note special meaning of `hywiki-allow-plurals-flag'."
(progn
(sit-for 0.2)
(cons 'command #'hywiki-tests--command))
(let ((vertico-mode 0))
(should (hact 'kbd-key "C-u C-h hhc WikiReferent RET c hywiki-tests--command RET"))
(hy-test-helpers:consume-input-events))))
(should (hact 'kbd-key "C-u C-h hhc WikiReferent RET c hywiki-tests--command RET"))
(hy-test-helpers:consume-input-events)))

;; Find
(ert-deftest hywiki-tests--save-referent-find ()
Expand All @@ -1362,13 +1364,12 @@ Note special meaning of `hywiki-allow-plurals-flag'."
(progn
(sit-for 0.2)
(cons 'find #'hywiki-word-grep))
(let ((vertico-mode 0))
(find-file wiki-page)
(hywiki-tests--insert "\nWikiReferent\n")
(hypb:save-buffer-silently)
(goto-char (point-min))
(should (hact 'kbd-key "C-u C-h hhc WikiReferent RET f RET"))
(hy-test-helpers:consume-input-events)))))
(find-file wiki-page)
(hywiki-tests--insert "\nWikiReferent\n")
(hypb:save-buffer-silently)
(goto-char (point-min))
(should (hact 'kbd-key "C-u C-h hhc WikiReferent RET f RET"))
(hy-test-helpers:consume-input-events))))

;; Global-button
(ert-deftest hywiki-tests--save-referent-global-button ()
Expand Down Expand Up @@ -1444,7 +1445,7 @@ Note special meaning of `hywiki-allow-plurals-flag'."
(hywiki-tests--referent-test
(progn
(sit-for 0.2)
(cons 'info-node "(emacs)*"))
(cons 'info-node "(emacs)"))
(save-excursion
(unwind-protect
(progn
Expand Down