mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 21:37:50 +00:00
Merge branch 'master' of code.orgmode.org:bzg/org-mode
This commit is contained in:
commit
02bde9634f
|
@ -576,6 +576,7 @@ CLOCK: [2016-12-28 Wed 13:09]--[2016-12-28 Wed 15:09] => 2:00"
|
|||
"Test \":link\" parameter in Clock table."
|
||||
;; If there is no file attached to the document, link directly to
|
||||
;; the headline.
|
||||
(let (org-link-descriptive)
|
||||
(should
|
||||
(equal
|
||||
"| Headline | Time |
|
||||
|
@ -591,17 +592,20 @@ CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|||
(should
|
||||
(equal
|
||||
"| Headline | Time |
|
||||
|-------------------------------------------+---------|
|
||||
|-----------------------------+---------|
|
||||
| *Total time* | *26:00* |
|
||||
|-------------------------------------------+---------|
|
||||
|-----------------------------+---------|
|
||||
| [[file:filename::Foo][Foo]] | 26:00 |"
|
||||
(org-test-with-temp-text
|
||||
(org-test-with-temp-text-in-file
|
||||
"* Foo
|
||||
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
||||
(let ((file (buffer-file-name)))
|
||||
(replace-regexp-in-string
|
||||
(regexp-quote file) "filename"
|
||||
(test-org-clock-clocktable-contents ":link t :lang en"))))))
|
||||
(test-org-clock-clocktable-contents ":link t :lang en"))))
|
||||
(org-table-align)
|
||||
(buffer-substring-no-properties (point-min) (point-max)))))
|
||||
;; Ignore TODO keyword, priority cookie, COMMENT and tags in
|
||||
;; headline.
|
||||
(should
|
||||
|
@ -676,9 +680,9 @@ CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|||
(should
|
||||
(equal
|
||||
"| Headline | Time |
|
||||
|-----------------------------------------+---------|
|
||||
|-----------------------------------------------------------+---------|
|
||||
| *Total time* | *26:00* |
|
||||
|-----------------------------------------+---------|
|
||||
|-----------------------------------------------------------+---------|
|
||||
| [[Foo [[https://orgmode.org\\][Org mode]\\]][Foo Org mode]] | 26:00 |"
|
||||
(org-test-with-temp-text
|
||||
"* Foo [[https://orgmode.org][Org mode]]
|
||||
|
@ -687,14 +691,14 @@ CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|||
(should
|
||||
(equal
|
||||
"| Headline | Time |
|
||||
|------------------------------+---------|
|
||||
|-----------------------------------------------------------+---------|
|
||||
| *Total time* | *26:00* |
|
||||
|------------------------------+---------|
|
||||
|-----------------------------------------------------------+---------|
|
||||
| [[Foo [[https://orgmode.org]\\]][Foo https://orgmode.org]] | 26:00 |"
|
||||
(org-test-with-temp-text
|
||||
"* Foo [[https://orgmode.org]]
|
||||
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
||||
(test-org-clock-clocktable-contents ":link t :lang en")))))
|
||||
(test-org-clock-clocktable-contents ":link t :lang en"))))))
|
||||
|
||||
(ert-deftest test-org-clock/clocktable/compact ()
|
||||
"Test \":compact\" parameter in Clock table."
|
||||
|
|
Loading…
Reference in a new issue