branch: master
commit 9e03f36388155178cbb29dadefed10ea0459a23d
Author: Oleh Krehel <ohwoeo...@gmail.com>
Commit: Oleh Krehel <ohwoeo...@gmail.com>
ivy-test.el: Turn two tests back on
The reason why they were failing is that they require `ivy-mode' to be
on, and ERT runs tests in a random order. So previously these tests
were not failing because a previous test turned `ivy-mode' on.
Fixes #2215
---
ivy-test.el | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/ivy-test.el b/ivy-test.el
index 1bd6974..9a645fd 100644
--- a/ivy-test.el
+++ b/ivy-test.el
@@ -950,10 +950,7 @@ will bring the behavior in line with the newer Emacsen."
(should (eq (ivy--sort-function 'c) fn1))))
(ert-deftest ivy-read-directory-name ()
- :expected-result (if (and (= emacs-major-version 24)
- (= emacs-minor-version 5))
- :failed
- :passed)
+ (ivy-mode 1)
(should
(equal (expand-file-name "/tmp/")
(ivy-with
@@ -1039,11 +1036,7 @@ a buffer visiting a file."
(ivy-mode ivy-mode-reset-arg)))
(ert-deftest ivy-read-file-name-make-directory ()
- :expected-result (if (and (= emacs-major-version 24)
- (= emacs-minor-version 5))
- ;; result is "/tmp/non-existant-dir/\n" for some reason
- :failed
- :passed)
+ (ivy-mode 1)
(should
(equal
(ivy-with
