diff options
| author | Axel Forsman <axel@axelf.se> | 2023-08-06 21:58:29 +0200 |
|---|---|---|
| committer | Tom Dalziel <tom_dl@hotmail.com> | 2023-08-20 23:46:23 +0100 |
| commit | 4beec94d14fc4180c41314edff997dbb9c422a23 (patch) | |
| tree | ad27845e6cef8c025895ba3eaf0b6e9e4667d0cc | |
| parent | ca024ff6a7ba6de7cfd581878d1bdce02b6adef2 (diff) | |
Avoid eval in evil-test-buffer
Whatever is returned by the macro will be evaluated anyway. This fixes
errors due to lexical-binding now being enabled in evil-tests.
| -rw-r--r-- | evil-test-helpers.el | 8 | ||||
| -rw-r--r-- | evil-tests.el | 16 |
2 files changed, 11 insertions, 13 deletions
diff --git a/evil-test-helpers.el b/evil-test-helpers.el index 7d67c56..c7eeb71 100644 --- a/evil-test-helpers.el +++ b/evil-test-helpers.el @@ -167,17 +167,15 @@ raised. Remaining forms are evaluated as-is. `(execute-kbd-macro (apply #'vconcat (mapcar #'listify-key-sequence - (mapcar #'eval ',form))))) + (list ,@form))))) ((memq (car-safe form) '(kbd vconcat)) `(execute-kbd-macro ,form)) - (t - form)))) + (t form)))) (if error-symbol `(should-error ,result :type ',error-symbol) result)))) body))) - (and (buffer-name buffer) - (kill-buffer buffer)))))) + (when (buffer-name buffer) (kill-buffer buffer)))))) (defmacro evil-test-selection (string &optional end-string before-predicate after-predicate) diff --git a/evil-tests.el b/evil-tests.el index 58d530d..b043762 100644 --- a/evil-tests.el +++ b/evil-tests.el @@ -9474,26 +9474,26 @@ parameter set." (evil-with-temp-file file-name "" (evil-test-buffer (vconcat "i" file-name [escape]) - (should (not (equal file-name (buffer-file-name (current-buffer))))) + (should (not (equal file-name (buffer-file-name)))) ("gf") - (should (equal file-name (buffer-file-name (current-buffer))))))) + (should (equal file-name (buffer-file-name)))))) (ert-info ("Find file at point (visual state)") (evil-with-temp-file file-name "" (evil-test-buffer (vconcat "iuser@localhost:" file-name "$" [escape]) - (should (not (equal file-name (buffer-file-name (current-buffer))))) + (should (not (equal file-name (buffer-file-name)))) ("0f:lvt$gf") - (should (equal file-name (buffer-file-name (current-buffer))))))) + (should (equal file-name (buffer-file-name)))))) (ert-info ("Find file at point with line number") (let* ((line-number 3) (file-content (make-string (* 2 line-number) ?\n))) (evil-with-temp-file file-name (insert file-content) (evil-test-buffer (vconcat "i" file-name (format ":%d" line-number) [escape]) - (should (and (not (equal file-name (buffer-file-name (current-buffer)))) + (should (and (not (equal file-name (buffer-file-name))) (not (equal line-number (line-number-at-pos))))) ("gF") - (should (and (equal file-name (buffer-file-name (current-buffer))) + (should (and (equal file-name (buffer-file-name)) (equal line-number (line-number-at-pos)))))))) (ert-info ("Find file at point with line and column numbers") (let* ((line-number 3) @@ -9505,11 +9505,11 @@ parameter set." (evil-with-temp-file file-name (insert file-content) (evil-test-buffer (vconcat "i" file-name (format ":%d:%d" line-number column-number) [escape]) - (should (and (not (equal file-name (buffer-file-name (current-buffer)))) + (should (and (not (equal file-name (buffer-file-name))) (not (equal line-number (line-number-at-pos))) (not (equal column-number (current-column))))) ("gF") - (should (and (equal file-name (buffer-file-name (current-buffer))) + (should (and (equal file-name (buffer-file-name)) (equal line-number (line-number-at-pos)) (equal column-number (1+ (current-column)))))))))) |