Merge: v0.8.7
This commit is contained in:
commit
f24d93f038
6 changed files with 241 additions and 128 deletions
|
|
@ -1690,7 +1690,36 @@ with keyword arg NOW in PLIST."
|
|||
(org-ql-expect ((org-ql--query-string-to-sexp "ts-active:with-time="))
|
||||
'("Take over the universe" "Take over the world" "Visit Mars" "Visit the moon" "Practice leaping tall buildings in a single bound" "Get haircut" "Internet" "Spaceship lease" "Fix flux capacitor" "/r/emacs" "Shop for groceries" "Rewrite Emacs in Common Lisp"))
|
||||
(org-ql-expect ((org-ql--query-string-to-sexp "ts-active:with-time=t"))
|
||||
'("Skype with president of Antarctica" "Renew membership in supervillain club" "Order a pizza"))))
|
||||
'("Skype with president of Antarctica" "Renew membership in supervillain club" "Order a pizza")))
|
||||
|
||||
(describe "matches timestamps with inner time ranges"
|
||||
(before-each
|
||||
(setq org-ql-test-buffer (org-ql-test-data-buffer "data-ts.org")
|
||||
org-ql-test-num-headings (with-current-buffer org-ql-test-buffer
|
||||
(org-with-wide-buffer
|
||||
(goto-char (point-min))
|
||||
;; Exclude the "Canary" heading.
|
||||
(1- (cl-loop while (re-search-forward org-heading-regexp nil t)
|
||||
sum 1))))))
|
||||
|
||||
(org-ql-it "without :with-time"
|
||||
(org-ql-expect ('(ts-active))
|
||||
'("Single-timestamp, without repeater" "Single-timestamp, with repeater (deadline)" "Multi-timestamp, without repeater" "French")))
|
||||
(org-ql-it ":with-time t"
|
||||
(org-ql-expect ('(ts-active :on "2024-06-25" :with-time t))
|
||||
'("Single-timestamp, without repeater" "Single-timestamp, with repeater (deadline)" "Multi-timestamp, without repeater"))
|
||||
(org-ql-expect ('(ts-active :on "2024-06-26" :with-time t))
|
||||
'("Multi-timestamp, without repeater")))
|
||||
(org-ql-it ":with-time t and with specified time value in :to"
|
||||
(org-ql-expect ('(ts-active :to "2024-06-25 09:00" :with-time t))
|
||||
'("Single-timestamp, without repeater" "Single-timestamp, with repeater (deadline)" "Multi-timestamp, without repeater"))
|
||||
;; FIXME: The test below fails because timestamps with
|
||||
;; ranges are not yet parsed into multiple timestamps and
|
||||
;; compared as a range. This will have to be addressed in
|
||||
;; a new version.
|
||||
;; (org-ql-expect ('(ts-active :from "2024-06-25 08:30"))
|
||||
;; '("Single-timestamp, without repeater" "Single-timestamp, with repeater (deadline)" "Multi-timestamp, without repeater"))
|
||||
)))
|
||||
|
||||
(describe "inactive"
|
||||
|
||||
|
|
@ -1829,7 +1858,20 @@ with keyword arg NOW in PLIST."
|
|||
'("Visit Mars")))
|
||||
(org-ql-then (:now "2019-07-07")
|
||||
(org-ql-expect ('(ts :on today))
|
||||
nil)))))
|
||||
nil))))
|
||||
|
||||
(describe "Day-of-week abbreviations"
|
||||
(before-each
|
||||
(setq org-ql-test-buffer (org-ql-test-data-buffer "data-ts.org")
|
||||
org-ql-test-num-headings (with-current-buffer org-ql-test-buffer
|
||||
(org-with-wide-buffer
|
||||
(goto-char (point-min))
|
||||
;; Exclude the "Canary" heading.
|
||||
(1- (cl-loop while (re-search-forward org-heading-regexp nil t)
|
||||
sum 1))))))
|
||||
(org-ql-it "matches French abbreviations (with trailing period)"
|
||||
(org-ql-expect ('(ts :on "2024-07-12"))
|
||||
'("French")))))
|
||||
|
||||
(describe "Compound queries"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue