branch: elpa/evil-goggles
commit 08a22058fd6a167f9f1b684c649008caef571459
Author: Evgeni Kolev <[email protected]>
Commit: Evgeni Kolev <[email protected]>
Remove evil-tests.el workaround
https://github.com/emacs-evil/evil/pull/1239
---
Makefile | 4 +---
evil-tests.patch | 52 ----------------------------------------------------
2 files changed, 1 insertion(+), 55 deletions(-)
diff --git a/Makefile b/Makefile
index 3587d99ed3..81aad980fb 100644
--- a/Makefile
+++ b/Makefile
@@ -18,10 +18,8 @@ LINT_PACKAGE_LINT_FILES=$(wildcard *.el)
# List of files to check for compilation errors and warnings:
LINT_COMPILE_FILES=${LINT_CHECKDOC_FILES}
-# TODO remove evil-tests.patch after this
https://github.com/emacs-evil/evil/pull/1239
test/evil-tests.el:
- curl -s
"https://raw.githubusercontent.com/emacs-evil/evil/master/evil-tests.el";
--output test/evil-tests.el
- git apply --directory=test/ evil-tests.patch
+ curl -s
"https://raw.githubusercontent.com/emacs-evil/evil/40daccf17685ba4e59cf56563a8b0c4a386e109c/evil-tests.el";
--output test/evil-tests.el
makel.mk:
# Download makel
diff --git a/evil-tests.patch b/evil-tests.patch
deleted file mode 100644
index 7bc3b76e4b..0000000000
--- a/evil-tests.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/evil-tests.el b/evil-tests.el
-index 8d10808..3fccb66 100644
---- a/evil-tests.el
-+++ b/evil-tests.el
-@@ -7602,6 +7602,7 @@ maybe we need one line more with some text\n")
-
- (ert-deftest evil-test-command-window-ex ()
- "Test command line window for ex commands"
-+ (skip-unless (not noninteractive))
- (let (evil-ex-history)
- (evil-test-buffer
- "[f]oo foo foo"
-@@ -7622,6 +7623,7 @@ maybe we need one line more with some text\n")
-
- (ert-deftest evil-test-command-window-recursive ()
- "Test that recursive command windows shouldn't be allowed"
-+ (skip-unless (not noninteractive))
- (let ((evil-command-window-height 0))
- (evil-test-buffer
- "[f]oo foo foo"
-@@ -7631,6 +7633,7 @@ maybe we need one line more with some text\n")
-
- (ert-deftest evil-test-command-window-noop ()
- "Test that executing a blank command does nothing"
-+ (skip-unless (not noninteractive))
- (evil-test-buffer
- "[f]oo foo foo"
- ("q:")
-@@ -7640,6 +7643,7 @@ maybe we need one line more with some text\n")
-
- (ert-deftest evil-test-command-window-multiple ()
- "Test that multiple command line windows can't be visible at the same time"
-+ (skip-unless (not noninteractive))
- (let ((evil-command-window-height 0))
- (evil-test-buffer
- "[f]oo foo foo"
-@@ -7660,6 +7664,7 @@ maybe we need one line more with some text\n")
-
- (ert-deftest evil-test-command-window-search-history ()
- "Test command window with forward and backward search history"
-+ (skip-unless (not noninteractive))
- (let ((evil-search-module 'isearch))
- (evil-test-buffer
- "[f]oo bar baz qux one two three four"
-@@ -7690,6 +7695,7 @@ maybe we need one line more with some text\n")
-
- (ert-deftest evil-test-command-window-search-word ()
- "Test command window history when searching for word under cursor"
-+ (skip-unless (not noninteractive))
- (let ((evil-search-module 'isearch))
- (evil-test-buffer
- "[f]oo bar foo bar foo"
