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

Tests: Fix filename tests for CI

Browse source 
As the comment says, in CI the filenames are being abbreviated, which
I can't explain (it has not always been this way).  So we compare them
in abbreviated form.
This commit is contained in:
Adam Porter 2024-06-27 08:03:04 -05:00
parent a8608f408b
commit 611198155d
1 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
tests/test-org-ql.el
View file

@ -2111,21 +2111,31 @@ 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"
(expect (var-after-bookmark-set-and-jump 'org-ql-view-buffers-files one-filename query) (should (equal (abbreviate-file-name
:to-equal one-filename)) (var-after-bookmark-set-and-jump 'org-ql-view-buffers-files one-filename query))
(abbreviate-file-name one-filename))))
(it "A list of filenames matches" (it "A list of filenames matches"
(expect (var-after-bookmark-set-and-jump 'org-ql-view-buffers-files temp-filenames query) (should (filenames-equal-p (var-after-bookmark-set-and-jump 'org-ql-view-buffers-files temp-filenames query)
:to-equal temp-filenames)) 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"
(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
:to-equal one-filename)) (find-file-noselect (car temp-filenames)) query))
(abbreviate-file-name one-filename))))
(it "A list of buffers matches" (it "A list of buffers 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
(mapcar #'find-file-noselect temp-filenames) query) (mapcar #'find-file-noselect temp-filenames) query)
:to-equal temp-filenames))))) temp-filenames)))))))
(describe "Dynamic blocks" (describe "Dynamic blocks"
(describe "warn about sexp queries" (describe "warn about sexp queries"