branch: externals/topspace
commit d376bca4c8cd8e787f54e46d73389cf0a7cfafbd
Author: Trevor Pogue <pogu...@mcmaster.ca>
Commit: Trevor Pogue <pogu...@mcmaster.ca>
Internal refactoring
- Add *.elc to gitignore
- In tests/director.el, rename :run property key to :eval
---
.gitignore | 3 ++-
tests/director.el | 4 ++--
tests/tests.el | 18 ++++++++----------
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/.gitignore b/.gitignore
index dea17d56b8..25db118621 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
*.~undo-tree~
-.projectile
\ No newline at end of file
+.projectile
+*.elc
\ No newline at end of file
diff --git a/tests/director.el b/tests/director.el
index a7bc633efc..dcde0a8d59 100644
--- a/tests/director.el
+++ b/tests/director.el
@@ -80,7 +80,7 @@ A step can be one of:
using `listify-key-sequence' and can contain special
characters, e.g. `(:type \"\\M-xsetenv\\r\")'
- `:call': shortcut to invoke an interactive command, e.g. `(:call setenv)'
-- `:run': Lisp form; it will be evaluated
+- `:eval': Lisp form; it will be evaluated
- `:log': Lisp form; it will be evaluated and its result will be
written to log; e.g. `(:log (buffer-file-name (current-buffer)))'
- `:wait': number; seconds to wait before next step; overrides
@@ -199,7 +199,7 @@ If DELAY-OVERRIDE is non-nil, the next step is delayed by
that value rather than
(director--schedule-next)
(call-interactively command))
- (`(:run ,form)
+ (`(:eval ,form)
(eval form)
(director--schedule-next))
diff --git a/tests/tests.el b/tests/tests.el
index 52267c61b5..ceaae5b413 100644
--- a/tests/tests.el
+++ b/tests/tests.el
@@ -12,15 +12,13 @@
:before-start (lambda ()
(global-set-key (kbd "C-M-n") 'scroll-down-line)
(global-set-key (kbd "C-M-p") 'scroll-up-line)
- (global-set-key (kbd "C-M-e") 'end-of-buffer)
(switch-to-buffer (find-file-noselect "../topspace.el" t))
- (global-topspace-mode)
- )
+ (global-topspace-mode))
:steps '(
;; Test scrolling using key commands
(:type "\M-v") ;; page down
(:type "\C-\M-n") ;; scroll down line
- (:assert (setq topspace--tests-prev-height (topspace--height)))
+ (:eval (setq topspace--tests-prev-height (topspace--height)))
(:type "\C-n") ;; next-line
(:assert (= (topspace--height) (1- topspace--tests-prev-height)))
(:type "\C-u2\C-n");; next-line x2
@@ -38,18 +36,18 @@
;; Test mouse scrolling
(:type "\M-v") ;; page down
- (:run (mwheel-scroll mouse-wheel-down-event)) ;; scroll down line
+ (:eval (mwheel-scroll mouse-wheel-down-event)) ;; scroll down line
(:assert (setq topspace--tests-prev-height (topspace--height)))
(:type "\C-n") ;; next-line
(:assert (= (topspace--height) (1- topspace--tests-prev-height)))
(:type "\C-u2\C-n");; next-line x2
(:assert (= (topspace--height) (- topspace--tests-prev-height 3)))
- (:run (mwheel-scroll mouse-wheel-down-event)) ;; scroll down line
- (:run (mwheel-scroll mouse-wheel-up-event)) ;; scroll up line
- (:run (mwheel-scroll mouse-wheel-down-event)) ;; scroll down line
+ (:eval (mwheel-scroll mouse-wheel-down-event)) ;; scroll down line
+ (:eval (mwheel-scroll mouse-wheel-up-event)) ;; scroll up line
+ (:eval (mwheel-scroll mouse-wheel-down-event)) ;; scroll down line
(:assert (= (topspace--height) (- topspace--tests-prev-height 2)))
- (:run (mwheel-scroll mouse-wheel-down-event)) ;; scroll down line
- (:run (mwheel-scroll mouse-wheel-down-event)) ;; scroll down line
+ (:eval (mwheel-scroll mouse-wheel-down-event)) ;; scroll down line
+ (:eval (mwheel-scroll mouse-wheel-down-event)) ;; scroll down line
(:assert (= (topspace--height) topspace--tests-prev-height))
)
:typing-style 'human
