From 2b5ce91b35e072ad9ab9462042d1a3cf9b3a223a Mon Sep 17 00:00:00 2001 From: Marco Wahl Date: Wed, 5 Jul 2017 12:33:47 +0200 Subject: [PATCH] org-timer: Fix timer setting from effort property Testcase included. --- lisp/org-timer.el | 2 +- testing/lisp/test-org-timer.el | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lisp/org-timer.el b/lisp/org-timer.el index 146775b20..5585f1c41 100644 --- a/lisp/org-timer.el +++ b/lisp/org-timer.el @@ -436,7 +436,7 @@ using three `C-u' prefix arguments." (if (numberp org-timer-default-timer) (number-to-string org-timer-default-timer) org-timer-default-timer)) - (effort-minutes (ignore-errors (org-get-at-eol 'effort-minutes 1))) + (effort-minutes (ignore-errors (floor (org-get-at-eol 'effort-minutes 1)))) (minutes (or (and (numberp opt) (number-to-string opt)) (and (not (equal opt '(64))) effort-minutes diff --git a/testing/lisp/test-org-timer.el b/testing/lisp/test-org-timer.el index 8abbb85e6..9c0aba91d 100644 --- a/testing/lisp/test-org-timer.el +++ b/testing/lisp/test-org-timer.el @@ -279,5 +279,21 @@ Also, mute output from `message'." (org-timer-start)) :type (list 'error 'user-error))) +(ert-deftest test-org-timer/set-timer-from-effort-prop () + "Test timer setting from effort property." + (should + (< (* 60 9) ; 9m + (test-org-timer/with-temp-text + "* foo +:PROPERTIES: +:Effort: 10 +:END:" + (org-mode) + (org-timer-set-timer) + (org-timer-hms-to-secs (org-timer nil t))) + (1+ (* 60 10)) ; 10m 1s + ))) + + (provide 'test-org-timer) ;;; test-org-timer.el end here