From d927d3d58d92c66d2c56b57405bd3807e499d6da Mon Sep 17 00:00:00 2001
From: Nathaniel Nicandro <nathanielnicandro@gmail.com>
Date: Thu, 21 Feb 2019 11:36:17 -0600
Subject: [PATCH] Test against the newest version of `org-mode`

---
 Cask                |  2 ++
 test/test-helper.el | 68 +++++++++++++++++++++++++++------------------
 2 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/Cask b/Cask
index 44f1a36..f556a52 100644
--- a/Cask
+++ b/Cask
@@ -1,5 +1,6 @@
 (source gnu)
 (source melpa)
+(source org)
 
 (package-file "jupyter.el")
 
@@ -9,4 +10,5 @@
 
 (development
  (depends-on "ert-runner")
+ (depends-on "org-plus-contrib")
  (depends-on "julia-mode"))
diff --git a/test/test-helper.el b/test/test-helper.el
index 946eef0..b129569 100644
--- a/test/test-helper.el
+++ b/test/test-helper.el
@@ -352,33 +352,47 @@ results instead of an equality match."
      "#+END_SRC")))
 
 (defun jupyter-org-test-src-block-1 (code test-result &optional regexp args)
-  (insert (jupyter-org-test-make-block code args))
-  (let* ((info (org-babel-get-src-block-info))
-         (end (point-marker)))
-    (set-marker-insertion-type end t)
-    (save-window-excursion
-      (org-babel-execute-src-block nil info))
-    (org-with-point-at (org-babel-where-is-src-block-result nil info)
-      (when (equal (alist-get :async args) "yes")
-        (jupyter-wait-until-idle
-         (ring-ref (oref jupyter-current-client pending-requests) 0)))
-      (let ((drawer (org-element-at-point)))
-        ;; Handle empty results with just a RESULTS keyword
-        ;;
-        ;; #+RESULTS:
-        (if (eq (org-element-type drawer) 'keyword) ""
-          (let ((result (string-trim
-                         (if (eq (org-element-type drawer) 'drawer)
+  (let ((src-block (jupyter-org-test-make-block code args)))
+    (insert src-block)
+    (let* ((info (org-babel-get-src-block-info))
+           (end (point-marker)))
+      (set-marker-insertion-type end t)
+      (save-window-excursion
+        (org-babel-execute-src-block nil info))
+      (org-with-point-at (org-babel-where-is-src-block-result nil info)
+        (when (equal (alist-get :async args) "yes")
+          (jupyter-wait-until-idle
+           (ring-ref (oref jupyter-current-client pending-requests) 0)))
+        (let ((drawer (org-element-at-point)))
+          ;; Handle empty results with just a RESULTS keyword
+          ;;
+          ;; #+RESULTS:
+          (if (eq (org-element-type drawer) 'keyword) ""
+            (let ((result (string-trim
+                           (if (eq (org-element-type drawer) 'drawer)
+                               (buffer-substring-no-properties
+                                (org-element-property :contents-begin drawer)
+                                (org-element-property :contents-end drawer))
                              (buffer-substring-no-properties
-                              (org-element-property :contents-begin drawer)
-                              (org-element-property :contents-end drawer))
-                           (buffer-substring-no-properties
-                            (org-element-property :post-affiliated drawer)
-                            (org-element-property :end drawer))))))
-            (if regexp (should (string-match-p test-result result))
-              (should (eq (compare-strings
-                           result nil nil test-result nil nil
-                           'ignore-case)
-                          t)))))))))
+                              (org-element-property :post-affiliated drawer)
+                              (org-element-property :end drawer))))))
+              (if regexp (should (string-match-p test-result result))
+                (message "\
+
+Testing src-block:
+%s
+
+Expected result:
+%s
+
+Result:
+%s
+
+"
+                         src-block result test-result)
+                (should (eq (compare-strings
+                             result nil nil test-result nil nil
+                             'ignore-case)
+                            t))))))))))
 
 ;;; test-helper.el ends here