2016-11-02 03:58:53 -04:00
|
|
|
|
;;; test-ox-publish.el --- Tests for "ox-publish.el" -*- lexical-binding: t; -*-
|
|
|
|
|
|
|
2019-01-01 05:50:56 -05:00
|
|
|
|
;; Copyright (C) 2016, 2019 Nicolas Goaziou
|
2016-11-02 03:58:53 -04:00
|
|
|
|
|
|
|
|
|
|
;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
|
|
|
|
|
|
|
|
|
|
|
;; This program is free software; you can redistribute it and/or modify
|
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
|
|
;; This program is distributed in the hope that it will be useful,
|
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2021-03-20 03:27:57 -04:00
|
|
|
|
;; along with this program. If not, see <https://www.gnu.org/licenses/>.
|
2016-11-02 03:58:53 -04:00
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
|
|
|
|
(require 'org-test "../testing/org-test")
|
|
|
|
|
|
(require 'ox-publish)
|
2016-12-29 15:48:02 -05:00
|
|
|
|
|
|
|
|
|
|
;;; Helper functions
|
|
|
|
|
|
|
2021-09-29 03:14:43 -04:00
|
|
|
|
(defun org-test-publish (properties handler &optional remove-prop)
|
2016-11-02 03:58:53 -04:00
|
|
|
|
"Publish a project defined by PROPERTIES.
|
|
|
|
|
|
Call HANDLER with the publishing directory as its sole argument.
|
|
|
|
|
|
Unless set otherwise in PROPERTIES, `:base-directory' is set to
|
|
|
|
|
|
\"examples/pub/\" sub-directory from test directory and
|
2021-09-29 03:14:43 -04:00
|
|
|
|
`:publishing-function' is set to `org-publish-attachment'.
|
|
|
|
|
|
Because `org-publish-property' uses `plist-member' to check the
|
|
|
|
|
|
existence of a property, a property with a value nil is different
|
|
|
|
|
|
from a non-existing property. Properties in REMOVE-PROP will be
|
|
|
|
|
|
removed from the final plist."
|
2016-12-29 15:48:02 -05:00
|
|
|
|
(declare (indent 1))
|
2016-11-02 03:58:53 -04:00
|
|
|
|
(let* ((org-publish-use-timestamps-flag nil)
|
|
|
|
|
|
(org-publish-cache nil)
|
|
|
|
|
|
(base-dir (expand-file-name "examples/pub/" org-test-dir))
|
|
|
|
|
|
(pub-dir (make-temp-file "org-test" t))
|
|
|
|
|
|
(org-publish-timestamp-directory
|
|
|
|
|
|
(expand-file-name ".org-timestamps/" pub-dir))
|
2021-09-29 03:14:43 -04:00
|
|
|
|
(props (org-plist-delete-all
|
|
|
|
|
|
(org-combine-plists
|
|
|
|
|
|
`(:base-directory ,base-dir
|
|
|
|
|
|
:publishing-function org-publish-attachment)
|
|
|
|
|
|
properties
|
|
|
|
|
|
`(:publishing-directory ,pub-dir))
|
|
|
|
|
|
remove-prop))
|
2016-11-02 03:58:53 -04:00
|
|
|
|
(project
|
2021-09-29 03:14:43 -04:00
|
|
|
|
`("test" ,@props)))
|
2016-11-02 03:58:53 -04:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(org-publish-projects (list project))
|
|
|
|
|
|
(funcall handler pub-dir))
|
|
|
|
|
|
;; Clear published data.
|
|
|
|
|
|
(delete-directory pub-dir t)
|
|
|
|
|
|
;; Delete auto-generated site-map file, if applicable.
|
|
|
|
|
|
(let ((site-map (and (plist-get properties :auto-sitemap)
|
|
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(or (plist-get properties :sitemap-filename)
|
|
|
|
|
|
"sitemap.org")
|
|
|
|
|
|
base-dir))))
|
|
|
|
|
|
(when (and site-map (file-exists-p site-map))
|
|
|
|
|
|
(delete-file site-map))))))
|
|
|
|
|
|
|
2016-12-29 15:48:02 -05:00
|
|
|
|
|
|
|
|
|
|
;;; Mandatory properties
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-publish/base-extension ()
|
|
|
|
|
|
"Test `:base-extension' specifications"
|
|
|
|
|
|
;; Regular tests.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal '("a.org" "b.org")
|
|
|
|
|
|
(org-test-publish '(:base-extension "org")
|
|
|
|
|
|
(lambda (dir)
|
|
|
|
|
|
(remove ".org-timestamps"
|
|
|
|
|
|
(cl-remove-if #'file-directory-p
|
|
|
|
|
|
(directory-files dir)))))))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal '("file.txt")
|
|
|
|
|
|
(org-test-publish '(:base-extension "txt")
|
|
|
|
|
|
(lambda (dir)
|
|
|
|
|
|
(remove ".org-timestamps"
|
|
|
|
|
|
(cl-remove-if #'file-directory-p
|
|
|
|
|
|
(directory-files dir)))))))
|
|
|
|
|
|
;; A nil value is equivalent to ".org".
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal '("a.org" "b.org")
|
|
|
|
|
|
(org-test-publish '(:base-extension nil)
|
|
|
|
|
|
(lambda (dir)
|
|
|
|
|
|
(remove ".org-timestamps"
|
|
|
|
|
|
(cl-remove-if #'file-directory-p
|
|
|
|
|
|
(directory-files dir)))))))
|
|
|
|
|
|
;; Symbol `any' includes all files, even those without extension.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal '("a.org" "b.org" "file.txt" "noextension")
|
|
|
|
|
|
(org-test-publish '(:base-extension any)
|
|
|
|
|
|
(lambda (dir)
|
|
|
|
|
|
(remove ".org-timestamps"
|
|
|
|
|
|
(cl-remove-if #'file-directory-p
|
2021-09-29 03:14:43 -04:00
|
|
|
|
(directory-files dir)))))))
|
|
|
|
|
|
|
2022-06-30 11:33:03 -04:00
|
|
|
|
;; Check the default transformation function,
|
2021-09-29 03:14:43 -04:00
|
|
|
|
;; org-html-publish-to-html. Because org-test-publish uses
|
|
|
|
|
|
;; org-publish-attachment by default, we must not just override with
|
|
|
|
|
|
;; nil but tell it to remove the :publishing-function from the list.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(let ((func (lambda (dir)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents (expand-file-name "a.html" dir))
|
|
|
|
|
|
(buffer-string)))))
|
|
|
|
|
|
(equal (org-test-publish nil func '(:publishing-function))
|
|
|
|
|
|
(org-test-publish '(:publishing-function org-html-publish-to-html) func)))))
|
2016-12-29 15:48:02 -05:00
|
|
|
|
|
2016-11-02 03:58:53 -04:00
|
|
|
|
|
|
|
|
|
|
;;; Site-map
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-publish/sitemap ()
|
|
|
|
|
|
"Test site-map specifications."
|
|
|
|
|
|
;; Site-map creation is controlled with `:auto-sitemap'. It
|
|
|
|
|
|
;; defaults to "sitemap.org".
|
|
|
|
|
|
(should
|
|
|
|
|
|
(org-test-publish
|
2016-12-29 15:48:02 -05:00
|
|
|
|
'(:auto-sitemap t)
|
|
|
|
|
|
(lambda (dir) (file-exists-p (expand-file-name "sitemap.org" dir)))))
|
2016-11-02 03:58:53 -04:00
|
|
|
|
(should-not
|
|
|
|
|
|
(org-test-publish
|
2016-12-29 15:48:02 -05:00
|
|
|
|
'(:auto-sitemap nil)
|
|
|
|
|
|
(lambda (dir) (file-exists-p (expand-file-name "sitemap.org" dir)))))
|
2016-11-02 03:58:53 -04:00
|
|
|
|
;; Site-map file name is controlled with `:sitemap-filename'.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(org-test-publish
|
2016-12-29 15:48:02 -05:00
|
|
|
|
'(:auto-sitemap t :sitemap-filename "mysitemap.org")
|
|
|
|
|
|
(lambda (dir) (file-exists-p (expand-file-name "mysitemap.org" dir)))))
|
2016-11-02 03:58:53 -04:00
|
|
|
|
;; Site-map title is controlled with `:sitemap-title'. It defaults
|
|
|
|
|
|
;; to the project name.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal "#+TITLE: Sitemap for project test"
|
|
|
|
|
|
(org-test-publish
|
2016-12-29 15:48:02 -05:00
|
|
|
|
'(:auto-sitemap t)
|
|
|
|
|
|
(lambda (dir)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents (expand-file-name "sitemap.org" dir))
|
|
|
|
|
|
(buffer-substring (point) (line-end-position)))))))
|
2016-11-02 03:58:53 -04:00
|
|
|
|
(should
|
|
|
|
|
|
(equal "#+TITLE: My title"
|
|
|
|
|
|
(org-test-publish
|
2016-12-29 15:48:02 -05:00
|
|
|
|
'(:auto-sitemap t :sitemap-title "My title")
|
|
|
|
|
|
(lambda (dir)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents (expand-file-name "sitemap.org" dir))
|
|
|
|
|
|
(buffer-substring (point) (line-end-position)))))))
|
2016-11-02 03:58:53 -04:00
|
|
|
|
;; Allowed site-map styles: `list' and `tree'.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal "
|
|
|
|
|
|
- [[file:a.org][A]]
|
|
|
|
|
|
- [[file:b.org][b]]
|
|
|
|
|
|
- [[file:sub/c.org][C]]"
|
|
|
|
|
|
(org-test-publish
|
2016-12-29 15:48:02 -05:00
|
|
|
|
'(:auto-sitemap t
|
|
|
|
|
|
:sitemap-sort-folders ignore
|
|
|
|
|
|
:sitemap-style list
|
|
|
|
|
|
:exclude "."
|
|
|
|
|
|
:include ("a.org" "b.org" "sub/c.org"))
|
|
|
|
|
|
(lambda (dir)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents (expand-file-name "sitemap.org" dir))
|
|
|
|
|
|
(buffer-substring (line-beginning-position 2) (point-max)))))))
|
2016-11-02 03:58:53 -04:00
|
|
|
|
(should
|
|
|
|
|
|
(equal "
|
|
|
|
|
|
- [[file:a.org][A]]
|
|
|
|
|
|
- [[file:b.org][b]]
|
|
|
|
|
|
- sub
|
|
|
|
|
|
- [[file:sub/c.org][C]]"
|
|
|
|
|
|
(org-test-publish
|
2016-12-29 15:48:02 -05:00
|
|
|
|
'(:auto-sitemap t
|
|
|
|
|
|
:sitemap-style tree
|
|
|
|
|
|
:exclude "."
|
|
|
|
|
|
:include ("a.org" "b.org" "sub/c.org"))
|
|
|
|
|
|
(lambda (dir)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents (expand-file-name "sitemap.org" dir))
|
|
|
|
|
|
(buffer-substring (line-beginning-position 2) (point-max)))))))
|
2016-11-02 03:58:53 -04:00
|
|
|
|
;; When style is `list', `:sitemap-sort-folders' controls the order
|
|
|
|
|
|
;; of appearance of directories among published files.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
"
|
|
|
|
|
|
- sub/
|
|
|
|
|
|
- [[file:a.org][A]]
|
|
|
|
|
|
- [[file:sub/c.org][C]]"
|
|
|
|
|
|
(org-test-publish
|
2016-12-29 15:48:02 -05:00
|
|
|
|
'(:auto-sitemap t
|
|
|
|
|
|
:recursive t
|
|
|
|
|
|
:sitemap-style list
|
|
|
|
|
|
:sitemap-sort-folders first
|
|
|
|
|
|
:exclude "."
|
|
|
|
|
|
:include ("a.org" "sub/c.org"))
|
|
|
|
|
|
(lambda (dir)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents (expand-file-name "sitemap.org" dir))
|
|
|
|
|
|
(buffer-substring (line-beginning-position 2) (point-max)))))))
|
2016-11-02 03:58:53 -04:00
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
"
|
|
|
|
|
|
- [[file:a.org][A]]
|
|
|
|
|
|
- [[file:sub/c.org][C]]
|
|
|
|
|
|
- sub/"
|
|
|
|
|
|
(org-test-publish
|
2016-12-29 15:48:02 -05:00
|
|
|
|
'(:auto-sitemap t
|
|
|
|
|
|
:recursive t
|
|
|
|
|
|
:sitemap-style list
|
|
|
|
|
|
:sitemap-sort-folders last
|
|
|
|
|
|
:exclude "."
|
|
|
|
|
|
:include ("a.org" "sub/c.org"))
|
|
|
|
|
|
(lambda (dir)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents (expand-file-name "sitemap.org" dir))
|
|
|
|
|
|
(buffer-substring (line-beginning-position 2) (point-max)))))))
|
2016-11-02 03:58:53 -04:00
|
|
|
|
;; When style is `list', `:sitemap-sort-folders' can be used to
|
|
|
|
|
|
;; toggle visibility of directories in the site-map.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(let ((case-fold-search t))
|
|
|
|
|
|
(string-match-p
|
|
|
|
|
|
"- sub/$"
|
|
|
|
|
|
(org-test-publish
|
2016-12-29 15:48:02 -05:00
|
|
|
|
'(:auto-sitemap t
|
|
|
|
|
|
:recursive t
|
|
|
|
|
|
:sitemap-style list
|
|
|
|
|
|
:sitemap-sort-folders t
|
|
|
|
|
|
:exclude "."
|
|
|
|
|
|
:include ("a.org" "sub/c.org"))
|
|
|
|
|
|
(lambda (dir)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents (expand-file-name "sitemap.org" dir))
|
|
|
|
|
|
(buffer-substring (line-beginning-position 2) (point-max))))))))
|
2016-11-02 03:58:53 -04:00
|
|
|
|
(should-not
|
|
|
|
|
|
(string-match-p
|
|
|
|
|
|
"- sub/$"
|
|
|
|
|
|
(org-test-publish
|
2016-12-29 15:48:02 -05:00
|
|
|
|
'(:auto-sitemap t
|
|
|
|
|
|
:recursive t
|
|
|
|
|
|
:sitemap-style list
|
|
|
|
|
|
:sitemap-sort-folders ignore
|
|
|
|
|
|
:exclude "."
|
|
|
|
|
|
:include ("a.org" "sub/c.org"))
|
|
|
|
|
|
(lambda (dir)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents (expand-file-name "sitemap.org" dir))
|
|
|
|
|
|
(buffer-substring (line-beginning-position 2) (point-max)))))))
|
2016-11-02 03:58:53 -04:00
|
|
|
|
;; Using `:sitemap-sort-files', files can be sorted alphabetically
|
|
|
|
|
|
;; (according to their title, or file name when there is none),
|
|
|
|
|
|
;; chronologically a anti-chronologically.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
"
|
|
|
|
|
|
- [[file:a.org][A]]
|
|
|
|
|
|
- [[file:b.org][b]]
|
|
|
|
|
|
- [[file:sub/c.org][C]]"
|
|
|
|
|
|
(org-test-publish
|
2016-12-29 15:48:02 -05:00
|
|
|
|
'(:auto-sitemap t
|
|
|
|
|
|
:recursive t
|
|
|
|
|
|
:sitemap-style list
|
|
|
|
|
|
:sitemap-sort-folders ignore
|
|
|
|
|
|
:sitemap-sort-files alphabetically
|
|
|
|
|
|
:exclude "."
|
|
|
|
|
|
:include ("a.org" "b.org" "sub/c.org"))
|
|
|
|
|
|
(lambda (dir)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents (expand-file-name "sitemap.org" dir))
|
|
|
|
|
|
(buffer-substring (line-beginning-position 2) (point-max)))))))
|
2016-11-02 03:58:53 -04:00
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
"
|
|
|
|
|
|
- [[file:b.org][b]]
|
|
|
|
|
|
- [[file:sub/c.org][C]]
|
|
|
|
|
|
- [[file:a.org][A]]"
|
|
|
|
|
|
(org-test-publish
|
2016-12-29 15:48:02 -05:00
|
|
|
|
'(:auto-sitemap t
|
|
|
|
|
|
:recursive t
|
|
|
|
|
|
:sitemap-style list
|
|
|
|
|
|
:sitemap-sort-folders ignore
|
|
|
|
|
|
:sitemap-sort-files chronologically
|
|
|
|
|
|
:exclude "."
|
|
|
|
|
|
:include ("a.org" "b.org" "sub/c.org"))
|
|
|
|
|
|
(lambda (dir)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents (expand-file-name "sitemap.org" dir))
|
|
|
|
|
|
(buffer-substring (line-beginning-position 2) (point-max)))))))
|
2016-11-02 03:58:53 -04:00
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
"
|
|
|
|
|
|
- [[file:a.org][A]]
|
|
|
|
|
|
- [[file:sub/c.org][C]]
|
|
|
|
|
|
- [[file:b.org][b]]"
|
|
|
|
|
|
(org-test-publish
|
2016-12-29 15:48:02 -05:00
|
|
|
|
'(:auto-sitemap t
|
|
|
|
|
|
:recursive t
|
|
|
|
|
|
:sitemap-style list
|
|
|
|
|
|
:sitemap-sort-folders ignore
|
|
|
|
|
|
:sitemap-sort-files anti-chronologically
|
|
|
|
|
|
:exclude "."
|
|
|
|
|
|
:include ("a.org" "b.org" "sub/c.org"))
|
|
|
|
|
|
(lambda (dir)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents (expand-file-name "sitemap.org" dir))
|
|
|
|
|
|
(buffer-substring (line-beginning-position 2) (point-max)))))))
|
2016-11-02 03:58:53 -04:00
|
|
|
|
;; `:sitemap-format-entry' formats entries in the site-map whereas
|
|
|
|
|
|
;; `:sitemap-function' controls the full site-map.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal "
|
|
|
|
|
|
- a.org"
|
|
|
|
|
|
(org-test-publish
|
2016-12-29 15:48:02 -05:00
|
|
|
|
'(:auto-sitemap t
|
|
|
|
|
|
:exclude "."
|
|
|
|
|
|
:include ("a.org")
|
|
|
|
|
|
:sitemap-format-entry
|
|
|
|
|
|
(lambda (f _s _p) f))
|
|
|
|
|
|
(lambda (dir)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents (expand-file-name "sitemap.org" dir))
|
|
|
|
|
|
(buffer-substring (line-beginning-position 2) (point-max)))))))
|
2016-11-02 03:58:53 -04:00
|
|
|
|
(should
|
|
|
|
|
|
(equal "Custom!"
|
|
|
|
|
|
(org-test-publish
|
2016-12-29 15:48:02 -05:00
|
|
|
|
'(:auto-sitemap t
|
|
|
|
|
|
:exclude "."
|
|
|
|
|
|
:include ("a.org")
|
|
|
|
|
|
:sitemap-function (lambda (_title _f) "Custom!"))
|
|
|
|
|
|
(lambda (dir)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents (expand-file-name "sitemap.org" dir))
|
|
|
|
|
|
(buffer-string))))))
|
2016-11-02 03:58:53 -04:00
|
|
|
|
(should
|
|
|
|
|
|
(equal "[[file:a.org][A]]"
|
|
|
|
|
|
(org-test-publish
|
2016-12-29 15:48:02 -05:00
|
|
|
|
'(:auto-sitemap t
|
|
|
|
|
|
:exclude "."
|
|
|
|
|
|
:include ("a.org")
|
|
|
|
|
|
:sitemap-function
|
|
|
|
|
|
(lambda (_title f) (org-list-to-generic f nil)))
|
|
|
|
|
|
(lambda (dir)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents (expand-file-name "sitemap.org" dir))
|
|
|
|
|
|
(buffer-string)))))))
|
|
|
|
|
|
|
2017-09-09 18:16:12 -04:00
|
|
|
|
|
|
|
|
|
|
;;; Cross references
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-publish/resolve-external-link ()
|
|
|
|
|
|
"Test `org-publish-resolve-external-link' specifications."
|
|
|
|
|
|
;; Function should preserve internal reference when used between
|
|
|
|
|
|
;; published files.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(apply
|
|
|
|
|
|
#'equal
|
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
|
|
|
|
(let* (;; (ids nil)
|
2017-09-09 18:16:12 -04:00
|
|
|
|
(backend
|
|
|
|
|
|
(org-export-create-backend
|
|
|
|
|
|
:transcoders
|
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
|
|
|
|
`((headline . ,(lambda (h c i)
|
|
|
|
|
|
(concat (org-export-get-reference h i) " " c)))
|
|
|
|
|
|
(paragraph . ,(lambda (_p c _i) c))
|
|
|
|
|
|
(section . ,(lambda (_s c _i) c))
|
|
|
|
|
|
(link . ,(lambda (l _c _i)
|
|
|
|
|
|
(let ((option (org-element-property :search-option l))
|
|
|
|
|
|
(path (org-element-property :path l)))
|
|
|
|
|
|
(and option
|
|
|
|
|
|
(org-publish-resolve-external-link
|
|
|
|
|
|
option path))))))))
|
2017-09-09 18:16:12 -04:00
|
|
|
|
(publish
|
|
|
|
|
|
(lambda (plist filename pub-dir)
|
|
|
|
|
|
(org-publish-org-to backend filename ".test" plist pub-dir))))
|
|
|
|
|
|
(org-test-publish
|
|
|
|
|
|
(list :publishing-function (list publish))
|
|
|
|
|
|
(lambda (dir)
|
|
|
|
|
|
(cl-subseq
|
|
|
|
|
|
(split-string
|
|
|
|
|
|
(mapconcat (lambda (f) (org-file-contents (expand-file-name f dir)))
|
|
|
|
|
|
(directory-files dir nil "\\.test\\'")
|
|
|
|
|
|
" "))
|
|
|
|
|
|
1 3))))))
|
|
|
|
|
|
;; When optional argument PREFER-CUSTOM is non-nil, use custom ID
|
|
|
|
|
|
;; instead of internal reference, whenever possible.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
2017-11-01 12:54:12 -04:00
|
|
|
|
'("a1" "b1")
|
2017-09-09 18:16:12 -04:00
|
|
|
|
(let* ((ids nil)
|
2017-11-01 12:54:12 -04:00
|
|
|
|
(link-transcoder
|
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
|
|
|
|
(lambda (l _c _i)
|
2017-11-01 12:54:12 -04:00
|
|
|
|
(let ((option (org-element-property :search-option l))
|
|
|
|
|
|
(path (org-element-property :path l)))
|
|
|
|
|
|
(push (org-publish-resolve-external-link option path t)
|
|
|
|
|
|
ids)
|
|
|
|
|
|
"")))
|
2017-09-09 18:16:12 -04:00
|
|
|
|
(backend
|
|
|
|
|
|
(org-export-create-backend
|
2017-11-01 12:54:12 -04:00
|
|
|
|
:transcoders `((headline . (lambda (h c i) c))
|
|
|
|
|
|
(paragraph . (lambda (p c i) c))
|
|
|
|
|
|
(section . (lambda (s c i) c))
|
|
|
|
|
|
(link . ,link-transcoder))))
|
2017-09-09 18:16:12 -04:00
|
|
|
|
(publish
|
|
|
|
|
|
(lambda (plist filename pub-dir)
|
2017-11-01 12:54:12 -04:00
|
|
|
|
(org-publish-org-to backend filename ".test" plist pub-dir))))
|
|
|
|
|
|
(org-test-publish (list :publishing-function (list publish)
|
|
|
|
|
|
:exclude "."
|
|
|
|
|
|
:include '("a.org" "b.org"))
|
|
|
|
|
|
#'ignore)
|
|
|
|
|
|
(sort ids #'string<)))))
|
2017-09-09 18:16:12 -04:00
|
|
|
|
|
2016-12-31 06:29:32 -05:00
|
|
|
|
|
|
|
|
|
|
;;; Tools
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-publish/get-project-from-filename ()
|
|
|
|
|
|
"Test `org-publish-get-project-from-filename' specifications."
|
|
|
|
|
|
;; Check base directory.
|
|
|
|
|
|
(should
|
2017-05-05 13:52:55 -04:00
|
|
|
|
(let* ((base (expand-file-name "examples/pub/" org-test-dir))
|
|
|
|
|
|
(file (expand-file-name "a.org" base))
|
|
|
|
|
|
(org-publish-project-alist `(("p" :base-directory ,base))))
|
|
|
|
|
|
(org-publish-get-project-from-filename file)))
|
2016-12-31 06:29:32 -05:00
|
|
|
|
;; Return nil if no appropriate project is found.
|
|
|
|
|
|
(should-not
|
2017-05-05 13:52:55 -04:00
|
|
|
|
(let* ((base (expand-file-name "examples/pub/" org-test-dir))
|
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
|
|
|
|
;; (file (expand-file-name "a.org" base))
|
2017-05-05 13:52:55 -04:00
|
|
|
|
(org-publish-project-alist `(("p" :base-directory ,base))))
|
2016-12-31 06:29:32 -05:00
|
|
|
|
(org-publish-get-project-from-filename "/other/file.org")))
|
|
|
|
|
|
;; Return the first project effectively publishing the provided
|
|
|
|
|
|
;; file.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal "p2"
|
2017-05-05 13:52:55 -04:00
|
|
|
|
(let* ((base (expand-file-name "examples/pub/" org-test-dir))
|
|
|
|
|
|
(file (expand-file-name "a.org" base))
|
|
|
|
|
|
(org-publish-project-alist
|
|
|
|
|
|
`(("p1" :base-directory "/other/")
|
2018-02-13 08:06:56 -05:00
|
|
|
|
("p2" :base-directory ,base)
|
|
|
|
|
|
("p3" :base-directory ,base))))
|
2017-05-05 13:52:55 -04:00
|
|
|
|
(car (org-publish-get-project-from-filename file)))))
|
2016-12-31 06:29:32 -05:00
|
|
|
|
;; When :recursive in non-nil, allow files in sub-directories.
|
|
|
|
|
|
(should
|
2017-05-05 13:52:55 -04:00
|
|
|
|
(let* ((base (expand-file-name "examples/pub/" org-test-dir))
|
|
|
|
|
|
(file (expand-file-name "sub/c.org" base))
|
|
|
|
|
|
(org-publish-project-alist
|
|
|
|
|
|
`(("p" :base-directory ,base :recursive t))))
|
|
|
|
|
|
(org-publish-get-project-from-filename file)))
|
2016-12-31 06:29:32 -05:00
|
|
|
|
(should-not
|
2017-05-05 13:52:55 -04:00
|
|
|
|
(let* ((base (expand-file-name "examples/pub/" org-test-dir))
|
|
|
|
|
|
(file (expand-file-name "sub/c.org" base))
|
|
|
|
|
|
(org-publish-project-alist
|
|
|
|
|
|
`(("p" :base-directory ,base :recursive nil))))
|
|
|
|
|
|
(org-publish-get-project-from-filename file)))
|
2018-02-13 08:06:56 -05:00
|
|
|
|
;; Also, when :recursive is non-nil, follow symlinks to directories.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(let* ((base (expand-file-name "examples/pub/" org-test-dir))
|
|
|
|
|
|
(file (expand-file-name "link/link.org" base))
|
|
|
|
|
|
(org-publish-project-alist
|
|
|
|
|
|
`(("p" :base-directory ,base :recursive t))))
|
|
|
|
|
|
(org-publish-get-project-from-filename file)))
|
|
|
|
|
|
(should-not
|
|
|
|
|
|
(let* ((base (expand-file-name "examples/pub/" org-test-dir))
|
|
|
|
|
|
(file (expand-file-name "link/link.org" base))
|
|
|
|
|
|
(org-publish-project-alist
|
|
|
|
|
|
`(("p" :base-directory ,base :recursive nil))))
|
|
|
|
|
|
(org-publish-get-project-from-filename file)))
|
2016-12-31 06:29:32 -05:00
|
|
|
|
;; Check :base-extension.
|
|
|
|
|
|
(should
|
2017-05-05 13:52:55 -04:00
|
|
|
|
(let* ((base (expand-file-name "examples/pub/" org-test-dir))
|
|
|
|
|
|
(file (expand-file-name "file.txt" base))
|
|
|
|
|
|
(org-publish-project-alist
|
|
|
|
|
|
`(("p" :base-directory ,base :base-extension "txt"))))
|
|
|
|
|
|
(org-publish-get-project-from-filename file)))
|
2016-12-31 06:29:32 -05:00
|
|
|
|
(should-not
|
2017-05-05 13:52:55 -04:00
|
|
|
|
(let* ((base (expand-file-name "examples/pub/" org-test-dir))
|
|
|
|
|
|
(file (expand-file-name "file.txt" base))
|
|
|
|
|
|
(org-publish-project-alist
|
|
|
|
|
|
`(("p" :base-directory ,base :base-extension "org"))))
|
|
|
|
|
|
(org-publish-get-project-from-filename file)))
|
2016-12-31 06:29:32 -05:00
|
|
|
|
;; When :base-extension has the special value `any', allow any
|
|
|
|
|
|
;; extension, including none.
|
|
|
|
|
|
(should
|
2017-05-05 13:52:55 -04:00
|
|
|
|
(let* ((base (expand-file-name "examples/pub/" org-test-dir))
|
|
|
|
|
|
(file (expand-file-name "file.txt" base))
|
|
|
|
|
|
(org-publish-project-alist
|
|
|
|
|
|
`(("p" :base-directory ,base :base-extension any))))
|
|
|
|
|
|
(org-publish-get-project-from-filename file)))
|
2016-12-31 06:29:32 -05:00
|
|
|
|
(should
|
2017-05-05 13:52:55 -04:00
|
|
|
|
(let* ((base (expand-file-name "examples/pub/" org-test-dir))
|
|
|
|
|
|
(file (expand-file-name "noextension" base))
|
|
|
|
|
|
(org-publish-project-alist
|
|
|
|
|
|
`(("p" :base-directory ,base :base-extension any))))
|
|
|
|
|
|
(org-publish-get-project-from-filename file)))
|
2017-09-24 04:57:11 -04:00
|
|
|
|
;; Pathological case: Handle both :extension any and :recursive t.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(let* ((base (expand-file-name "examples/pub/" org-test-dir))
|
|
|
|
|
|
(file (expand-file-name "sub/c.org" base))
|
|
|
|
|
|
(org-publish-project-alist
|
|
|
|
|
|
`(("p" :base-directory ,base :recursive t :base-extension any))))
|
|
|
|
|
|
(org-publish-get-base-files (org-publish-get-project-from-filename file))))
|
2016-12-31 06:29:32 -05:00
|
|
|
|
;; Check :exclude property.
|
|
|
|
|
|
(should-not
|
2017-05-05 13:52:55 -04:00
|
|
|
|
(let* ((base (expand-file-name "examples/pub/" org-test-dir))
|
|
|
|
|
|
(file (expand-file-name "a.org" base))
|
|
|
|
|
|
(org-publish-project-alist
|
|
|
|
|
|
`(("p" :base-directory ,base :exclude "a"))))
|
|
|
|
|
|
(org-publish-get-project-from-filename file)))
|
2016-12-31 06:29:32 -05:00
|
|
|
|
(should
|
2017-05-05 13:52:55 -04:00
|
|
|
|
(let* ((base (expand-file-name "examples/pub/" org-test-dir))
|
|
|
|
|
|
(file (expand-file-name "a.org" base))
|
|
|
|
|
|
(org-publish-project-alist
|
|
|
|
|
|
`(("p" :base-directory ,base :exclude "other"))))
|
|
|
|
|
|
(org-publish-get-project-from-filename file)))
|
2016-12-31 06:29:32 -05:00
|
|
|
|
;; The regexp matches against relative file name, not absolute one.
|
|
|
|
|
|
(should
|
2017-05-05 13:52:55 -04:00
|
|
|
|
(let* ((base (expand-file-name "examples/pub/" org-test-dir))
|
|
|
|
|
|
(file (expand-file-name "a.org" base))
|
|
|
|
|
|
(org-publish-project-alist
|
|
|
|
|
|
`(("p" :base-directory ,base :exclude "examples/pub"))))
|
|
|
|
|
|
(org-publish-get-project-from-filename file)))
|
2016-12-31 06:29:32 -05:00
|
|
|
|
;; Check :include property.
|
|
|
|
|
|
(should
|
2017-05-05 13:52:55 -04:00
|
|
|
|
(let* ((base (expand-file-name "examples/pub/" org-test-dir))
|
|
|
|
|
|
(file (expand-file-name "file.txt" base))
|
|
|
|
|
|
(org-publish-project-alist
|
|
|
|
|
|
`(("p" :base-directory ,base :include (,file)))))
|
|
|
|
|
|
(org-publish-get-project-from-filename file)))
|
2016-12-31 06:29:32 -05:00
|
|
|
|
;; :include property has precedence over :exclude one.
|
|
|
|
|
|
(should
|
2017-05-05 13:52:55 -04:00
|
|
|
|
(let* ((base (expand-file-name "examples/pub/" org-test-dir))
|
|
|
|
|
|
(file (expand-file-name "a.org" base))
|
|
|
|
|
|
(org-publish-project-alist
|
|
|
|
|
|
`(("p"
|
|
|
|
|
|
:base-directory ,base
|
|
|
|
|
|
:include (,(file-name-nondirectory file))
|
|
|
|
|
|
:exclude "a"))))
|
|
|
|
|
|
(org-publish-get-project-from-filename file)))
|
2016-12-31 06:29:32 -05:00
|
|
|
|
;; With optional argument, return a meta-project publishing provided
|
|
|
|
|
|
;; file.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal "meta"
|
2017-05-05 13:52:55 -04:00
|
|
|
|
(let* ((base (expand-file-name "examples/pub/" org-test-dir))
|
|
|
|
|
|
(file (expand-file-name "a.org" base))
|
|
|
|
|
|
(org-publish-project-alist
|
|
|
|
|
|
`(("meta" :components ("p"))
|
|
|
|
|
|
("p" :base-directory ,base))))
|
|
|
|
|
|
(car (org-publish-get-project-from-filename file t))))))
|
2016-12-31 06:29:32 -05:00
|
|
|
|
|
2017-11-26 04:46:53 -05:00
|
|
|
|
(ert-deftest test-org-publish/file-relative-name ()
|
|
|
|
|
|
"Test `org-publish-file-relative-name' specifications."
|
|
|
|
|
|
;; Turn absolute file names into relative ones if file belongs to
|
|
|
|
|
|
;; base directory.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal "a.org"
|
|
|
|
|
|
(let* ((base (expand-file-name "examples/pub/" org-test-dir))
|
|
|
|
|
|
(file (expand-file-name "a.org" base)))
|
|
|
|
|
|
(org-publish-file-relative-name file `(:base-directory ,base)))))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal "pub/a.org"
|
|
|
|
|
|
(let* ((base (expand-file-name "examples/" org-test-dir))
|
|
|
|
|
|
(file (expand-file-name "pub/a.org" base)))
|
|
|
|
|
|
(org-publish-file-relative-name file `(:base-directory ,base)))))
|
|
|
|
|
|
;; Absolute file names that do not belong to base directory are
|
|
|
|
|
|
;; unchanged.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal "/name.org"
|
|
|
|
|
|
(let ((base (expand-file-name "examples/pub/" org-test-dir)))
|
|
|
|
|
|
(org-publish-file-relative-name "/name.org"
|
|
|
|
|
|
`(:base-directory ,base)))))
|
|
|
|
|
|
;; Relative file names are unchanged.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal "a.org"
|
|
|
|
|
|
(let ((base (expand-file-name "examples/pub/" org-test-dir)))
|
|
|
|
|
|
(org-publish-file-relative-name "a.org" `(:base-directory ,base))))))
|
|
|
|
|
|
|
2016-11-02 03:58:53 -04:00
|
|
|
|
|
|
|
|
|
|
(provide 'test-ox-publish)
|
|
|
|
|
|
;;; test-ox-publish.el ends here
|
