summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrasmus <rasmus@pank.eu>2014-10-02 19:41:31 +0200
committerAchim Gratz <Stromeko@Stromeko.DE>2014-10-02 21:05:10 +0200
commit4412fed8507b3fe0bcb1c49192d1a98ade11bb61 (patch)
tree4453e1a7c20b2e1a8e8d0f890bd160fabdd78838
parentcf77a8e878f5177121b500e0da1422748e16db04 (diff)
downloadorg-mode-4412fed8507b3fe0bcb1c49192d1a98ade11bb61.tar.gz
test-ox.el: Fix test-error from 986037a.
* test-ox.el (test-org-export/expand-include): Updated tests.
-rw-r--r--testing/lisp/test-ox.el28
1 files changed, 14 insertions, 14 deletions
diff --git a/testing/lisp/test-ox.el b/testing/lisp/test-ox.el
index 915a5a6..2642f4a 100644
--- a/testing/lisp/test-ox.el
+++ b/testing/lisp/test-ox.el
@@ -804,18 +804,18 @@ text
(org-test-with-temp-text "#+INCLUDE: dummy.org"
(org-export-expand-include-keyword)))
;; Full insertion with recursive inclusion.
- (org-test-with-temp-text
- (format "#+INCLUDE: \"%s/examples/include.org\"" org-test-dir)
- (org-export-expand-include-keyword)
- (should (equal (buffer-string)
- "Small Org file with an include keyword.
-
-#+BEGIN_SRC emacs-lisp :exports results\n(+ 2 1)\n#+END_SRC
-
-Success!
-
-* Heading
-body\n")))
+ (should
+ (equal
+ (with-temp-buffer
+ (insert-file
+ (expand-file-name "examples/include.org" org-test-dir))
+ (replace-regexp-in-string
+ (regexp-quote "#+INCLUDE: \"include2.org\"")
+ "Success!" (buffer-string)))
+ (org-test-with-temp-text
+ (format "#+INCLUDE: \"%s/examples/include.org\"" org-test-dir)
+ (org-export-expand-include-keyword)
+ (buffer-string))))
;; Localized insertion.
(org-test-with-temp-text
(format "#+INCLUDE: \"%s/examples/include.org\" :lines \"1-2\""
@@ -829,7 +829,7 @@ body\n")))
"* Top heading\n** Heading\nbody\n"
(org-test-with-temp-text
(format
- "* Top heading\n#+INCLUDE: \"%s/examples/include.org\" :lines \"9-\""
+ "* Top heading\n#+INCLUDE: \"%s/examples/include.org\" :lines \"9-11\""
org-test-dir)
(org-export-expand-include-keyword)
(buffer-string))))
@@ -838,7 +838,7 @@ body\n")))
"* Top heading\n* Heading\nbody\n"
(org-test-with-temp-text
(format
- "* Top heading\n#+INCLUDE: \"%s/examples/include.org\" :lines \"9-\" :minlevel 1"
+ "* Top heading\n#+INCLUDE: \"%s/examples/include.org\" :lines \"9-11\" :minlevel 1"
org-test-dir)
(org-export-expand-include-keyword)
(buffer-string))))