diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-02-13 17:22:22 +0100 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-02-13 17:22:22 +0100 |
| commit | 5902b9c2a73434505a91ef4e52f8239e68e6ae75 (patch) | |
| tree | ae80ff1424fb32263d4395bc29b5b0f11806d695 | |
| parent | b0251b747a005c2778c162e863625dd87b21f42b (diff) | |
| parent | 990fd09ca86ef9bd6c64060d8cd668c80ed7ad9e (diff) | |
| download | org-mode-5902b9c2a73434505a91ef4e52f8239e68e6ae75.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | testing/lisp/test-org-element.el | 8 | ||||
| -rw-r--r-- | testing/lisp/test-org-pcomplete.el | 10 | ||||
| -rw-r--r-- | testing/lisp/test-ox.el | 5 |
3 files changed, 9 insertions, 14 deletions
diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el index 295009e..431072e 100644 --- a/testing/lisp/test-org-element.el +++ b/testing/lisp/test-org-element.el @@ -1652,14 +1652,6 @@ e^{i\\pi}+1=0 :path (org-element-map (org-element-parse-buffer) 'link #'identity nil t)))))) - ;; ... id link. - (should - (equal - "id" - (org-test-with-temp-text "[[id:aaaa]]" - (org-element-property - :type - (org-element-map (org-element-parse-buffer) 'link 'identity nil t))))) ;; ... custom-id link. (should (equal diff --git a/testing/lisp/test-org-pcomplete.el b/testing/lisp/test-org-pcomplete.el index 064cd4f..56f7185 100644 --- a/testing/lisp/test-org-pcomplete.el +++ b/testing/lisp/test-org-pcomplete.el @@ -43,17 +43,19 @@ (ert-deftest test-org-pcomplete/keyword () "Test keyword and block completion." (should - (equal + (string-prefix-p "#+startup: " (org-test-with-temp-text "#+start<point>" (pcomplete) - (buffer-string)))) + (buffer-string)) + t)) (should - (equal + (string-prefix-p "#+begin_center" (org-test-with-temp-text "#+begin_ce<point>" (pcomplete) - (buffer-string))))) + (buffer-string)) + t))) (provide 'test-org-pcomplete) ;;; test-org-pcomplete.el ends here diff --git a/testing/lisp/test-ox.el b/testing/lisp/test-ox.el index 573c00a..6d8b1dd 100644 --- a/testing/lisp/test-ox.el +++ b/testing/lisp/test-ox.el @@ -3310,8 +3310,9 @@ Another text. (ref:text) "Test `org-export-file-uri' specifications." ;; Preserve relative filenames. (should (equal "relative.org" (org-export-file-uri "relative.org"))) - ;; Local files start with "file:///" - (should (equal "file:///local.org" (org-export-file-uri "/local.org"))) + ;; Local files start with "file://" + (should (equal (concat "file://" (expand-file-name "/local.org")) + (org-export-file-uri "/local.org"))) ;; Remote files start with "file://" (should (equal "file://myself@some.where:papers/last.pdf" (org-export-file-uri "/myself@some.where:papers/last.pdf"))) |