jiri/org-ql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Tests: Fix filename tests for CI"

Browse source 
This reverts commit 611198155d.
This commit is contained in:
Adam Porter 2024-09-04 21:40:36 -05:00
parent fcb4e3ee62
commit f72feb8018
1 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

40
tests/test-org-ql.el
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 (it "One filename matches"
;; abbreviated (i.e. "/home/FOO" is replaced with "~/FOO"); (expect (var-after-bookmark-set-and-jump 'org-ql-view-buffers-files one-filename query)
;; I can only guess it's something to do with the way the :to-equal one-filename))
;; Emacs instance is built in the Nix images we use there. (it "A list of filenames matches"
;; So we have to compare the filenames in abbreviated form. (expect (var-after-bookmark-set-and-jump 'org-ql-view-buffers-files temp-filenames query)
(cl-labels ((filenames-equal-p (a b) :to-equal temp-filenames))
(seq-set-equal-p (mapcar #'abbreviate-file-name a) ;; NOTE: These actually bookmark the filenames backing the buffers.
(mapcar #'abbreviate-file-name b)))) (it "One buffer matches"
(it "One filename matches" (expect (var-after-bookmark-set-and-jump 'org-ql-view-buffers-files
(should (equal (abbreviate-file-name (find-file-noselect (car temp-filenames)) 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 buffers matches"
(it "A list of filenames matches" (expect (var-after-bookmark-set-and-jump 'org-ql-view-buffers-files
(should (filenames-equal-p (var-after-bookmark-set-and-jump 'org-ql-view-buffers-files temp-filenames query) (mapcar #'find-file-noselect temp-filenames) query)
temp-filenames))) :to-equal temp-filenames)))))
;; NOTE: These actually bookmark the filenames backing the buffers.
(it "One buffer matches"
(should (equal (abbreviate-file-name
(var-after-bookmark-set-and-jump 'org-ql-view-buffers-files
(find-file-noselect (car temp-filenames)) query))
(abbreviate-file-name one-filename))))
(it "A list of buffers matches"
(should (filenames-equal-p (var-after-bookmark-set-and-jump 'org-ql-view-buffers-files
(mapcar #'find-file-noselect temp-filenames) query)
temp-filenames)))))))
(describe "Dynamic blocks" (describe "Dynamic blocks"
(describe "warn about sexp queries" (describe "warn about sexp queries"