Revert "Tests: Fix filename tests for CI"

This reverts commit 611198155d.
This commit is contained in:
Adam Porter 2024-09-04 21:40:36 -05:00
parent fcb4e3ee62
commit f72feb8018

View file

@ -2111,31 +2111,21 @@ with keyword arg NOW in PLIST."
(describe "Buffers/Files" (describe "Buffers/Files"
:var ((query '(and (todo "TODO") (regexp "heading"))) :var ((query '(and (todo "TODO") (regexp "heading")))
(one-filename (car temp-filenames))) (one-filename (car temp-filenames)))
;; NOTE: Inexplicably, on GitHub CI, the filenames are being
;; abbreviated (i.e. "/home/FOO" is replaced with "~/FOO");
;; I can only guess it's something to do with the way the
;; Emacs instance is built in the Nix images we use there.
;; So we have to compare the filenames in abbreviated form.
(cl-labels ((filenames-equal-p (a b)
(seq-set-equal-p (mapcar #'abbreviate-file-name a)
(mapcar #'abbreviate-file-name b))))
(it "One filename matches" (it "One filename matches"
(should (equal (abbreviate-file-name (expect (var-after-bookmark-set-and-jump 'org-ql-view-buffers-files one-filename query)
(var-after-bookmark-set-and-jump 'org-ql-view-buffers-files one-filename query)) :to-equal one-filename))
(abbreviate-file-name one-filename))))
(it "A list of filenames matches" (it "A list of filenames matches"
(should (filenames-equal-p (var-after-bookmark-set-and-jump 'org-ql-view-buffers-files temp-filenames query) (expect (var-after-bookmark-set-and-jump 'org-ql-view-buffers-files temp-filenames query)
temp-filenames))) :to-equal temp-filenames))
;; NOTE: These actually bookmark the filenames backing the buffers. ;; NOTE: These actually bookmark the filenames backing the buffers.
(it "One buffer matches" (it "One buffer matches"
(should (equal (abbreviate-file-name (expect (var-after-bookmark-set-and-jump 'org-ql-view-buffers-files
(var-after-bookmark-set-and-jump 'org-ql-view-buffers-files (find-file-noselect (car temp-filenames)) query)
(find-file-noselect (car temp-filenames)) query)) :to-equal one-filename))
(abbreviate-file-name one-filename))))
(it "A list of buffers matches" (it "A list of buffers matches"
(should (filenames-equal-p (var-after-bookmark-set-and-jump 'org-ql-view-buffers-files (expect (var-after-bookmark-set-and-jump 'org-ql-view-buffers-files
(mapcar #'find-file-noselect temp-filenames) query) (mapcar #'find-file-noselect temp-filenames) query)
temp-filenames))))))) :to-equal temp-filenames)))))
(describe "Dynamic blocks" (describe "Dynamic blocks"
(describe "warn about sexp queries" (describe "warn about sexp queries"