add test for trash processing

j-palms · Apr 17, 2023 · 58dd0b7 · 58dd0b7
1 parent aad6d09
commit 58dd0b7
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 29 deletions.
diff --git a/org-gtd-trash.el b/org-gtd-trash.el
@@ -44,7 +44,8 @@
 (defun org-gtd-trash--apply ()
   "Mark GTD inbox item as cancelled and move it to the org-gtd task archives."
   (org-todo org-gtd-canceled)
-  (with-org-gtd-context (org-archive-subtree)))
+  (with-org-gtd-context
+      (org-gtd-archive-item-at-point)))
 
 (provide 'org-gtd-trash)
 ;;; org-gtd-trash.el ends here
diff --git a/test/helpers/clarifying.el b/test/helpers/clarifying.el
@@ -28,3 +28,7 @@
 
 (defun ogt-clarify-as-knowledge-item ()
   (execute-kbd-macro (kbd "C-c c k")))
+
+
+(defun ogt-clarify-as-trash-item ()
+  (execute-kbd-macro (kbd "C-c c t")))
diff --git a/test/helpers/processing.el b/test/helpers/processing.el
@@ -49,3 +49,8 @@
   (with-simulated-input project-heading-simulated-input
                         (org-gtd-organize-inbox-item
                          org-gtd-organize-add-to-project-func)))
+
+(defun ogt-capture-and-process-trash-item (label)
+  (ogt-capture-single-item label)
+  (org-gtd-process-inbox)
+  (ogt-clarify-as-trash-item))
diff --git a/test/processing-test.el b/test/processing-test.el
@@ -24,23 +24,19 @@
 
      (execute-kbd-macro (kbd "M-> RET"))
      (insert ogt--project-text)
-     (execute-kbd-macro (kbd "C-c c p"))
+     (ogt-clarify-as-project)
 
-     (execute-kbd-macro (kbd "C-c c c RET"))
-
-     (execute-kbd-macro (kbd "C-c c d RET Someone RET"))
-
-     (execute-kbd-macro (kbd "C-c c i RET"))
-
-     (execute-kbd-macro (kbd "C-c c s"))
-
-     (execute-kbd-macro (kbd "C-c c k"))
+     (ogt-clarify-as-calendar-item)
+     (ogt-clarify-as-delegated-item "Someone")
+     (ogt-clarify-as-incubated-item)
+     (ogt-clarify-as-single-action)
+     (ogt-clarify-as-knowledge-item)
 
      (execute-kbd-macro (kbd "M-> RET"))
      (insert ogt--project-text)
-     (execute-kbd-macro (kbd "C-c c p"))
+     (ogt-clarify-as-project)
 
-     (execute-kbd-macro (kbd "C-c c c RET"))
+     (ogt-clarify-as-calendar-item)
 
      (dotimes (x 8)
        (ogt-capture-single-item (format "single action %s" x)))
@@ -51,22 +47,15 @@
 
      (execute-kbd-macro (kbd "M-> RET"))
      (insert ogt--project-text)
-     (execute-kbd-macro (kbd "C-c c p"))
-
-     (execute-kbd-macro (kbd "C-c c s"))
-
-     (execute-kbd-macro (kbd "C-c c s"))
-
-     (execute-kbd-macro (kbd "C-c c c RET"))
-
-     (execute-kbd-macro (kbd "C-c c d RET Someone RET"))
-
-     (execute-kbd-macro (kbd "C-c c i RET"))
-
-     (execute-kbd-macro (kbd "C-c c s"))
-
-     (execute-kbd-macro (kbd "C-c c k"))
-
+     (ogt-clarify-as-project)
+
+     (ogt-clarify-as-single-action)
+     (ogt-clarify-as-single-action)
+     (ogt-clarify-as-calendar-item)
+     (ogt-clarify-as-delegated-item "Someone")
+     (ogt-clarify-as-incubated-item)
+     (ogt-clarify-as-single-action)
+     (ogt-clarify-as-knowledge-item)
 
      (with-current-buffer (org-gtd--inbox-file)
        (expect (ogt--current-buffer-raw-text)

diff --git a/test/trash-test.el b/test/trash-test.el
@@ -0,0 +1,17 @@
+;; -*- lexical-binding: t; coding: utf-8 -*-
+
+(load "test/helpers/setup.el")
+(require 'org-gtd)
+(require 'buttercup)
+(require 'with-simulated-input)
+
+(describe
+ "Processing a trash item"
+
+ (before-each (ogt--configure-emacs))
+ (after-each (ogt--close-and-delete-files))
+
+ (it "through the inbox, mark a task as trash"
+     (ogt-capture-and-process-trash-item "Yowza")
+     (with-current-buffer (ogt--archive)
+       (expect (buffer-string) :to-match "Yowza"))))