From 64fb57b539a0965ac57b08bfa1a14ab8bd8710dd Mon Sep 17 00:00:00 2001
From: James Nguyen <james@jojojames.com>
Date: Fri, 30 Mar 2018 19:11:13 -0700
Subject: [PATCH] Move and rebind ert

---
 evil-collection-ert.el         | 69 ++++++++++++++++++++++++++++++++++
 evil-collection-integration.el |  4 --
 evil-collection.el             |  1 +
 3 files changed, 70 insertions(+), 4 deletions(-)
 create mode 100644 evil-collection-ert.el

diff --git a/evil-collection-ert.el b/evil-collection-ert.el
new file mode 100644
index 0000000..c8ebd48
--- /dev/null
+++ b/evil-collection-ert.el
@@ -0,0 +1,69 @@
+;;; evil-collection-ert.el --- Bindings for `ert' -*- lexical-binding: t -*-
+
+;; Copyright (C) 2018 James Nguyen
+
+;; Author: James Nguyen <james@jojojames.com>
+;; Maintainer: James Nguyen <james@jojojames.com>
+;; Pierre Neidhardt <ambrevar@gmail.com>
+;; URL: https://github.com/emacs-evil/evil-collection
+;; Version: 0.0.1
+;; Package-Requires: ((emacs "25.1"))
+;; Keywords: evil, emacs, tools
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;; Bindings for `ert'
+
+;;; Code:
+(require 'ert)
+(require 'evil)
+
+(defconst evil-collection-ert-maps '(ert-results-mode-map))
+
+(defun evil-collection-ert-setup ()
+  "Set up `evil' bindings for `ert'."
+  (evil-set-initial-state 'ert-results-mode 'normal)
+
+  (evil-define-key 'normal ert-results-mode-map
+    "j" 'evil-next-line
+    "k" 'evil-previous-line
+    "h" 'evil-backward-char
+    "l" 'evil-forward-char
+    ;; Stuff that's not in the menu.
+    "J" 'ert-results-jump-between-summary-and-result
+    "L" 'ert-results-toggle-printer-limits-for-test-at-point
+    "gj" 'ert-results-next-test
+    "gk" 'ert-results-previous-test
+    "]" 'ert-results-next-test
+    "[" 'ert-results-previous-test
+    (kbd "C-j") 'ert-results-next-test
+    (kbd "C-k") 'ert-results-previous-test
+    ;; Stuff that is in the menu.
+    "gr" 'ert-results-rerun-all-tests
+    "R" 'ert-results-rerun-all-tests
+    "r" 'ert-results-rerun-test-at-point
+    "d" 'ert-results-rerun-test-at-point-debugging-errors
+    "." 'ert-results-find-test-at-point-other-window
+    "gd" 'ert-results-find-test-at-point-other-window
+    "B" 'ert-results-pop-to-backtrace-for-test-at-point
+    "M" 'ert-results-pop-to-messages-for-test-at-point
+    "S" 'ert-results-pop-to-should-forms-for-test-at-point
+    "K" 'ert-results-describe-test-at-point
+    "g?" 'ert-results-describe-test-at-point
+    "x" 'ert-delete-test
+    "T" 'ert-results-pop-to-timings))
+
+(provide 'evil-collection-ert)
+;;; evil-collection-ert.el ends here
diff --git a/evil-collection-integration.el b/evil-collection-integration.el
index 4d8c652..1284508 100644
--- a/evil-collection-integration.el
+++ b/evil-collection-integration.el
@@ -118,10 +118,6 @@
   '(defadvice elp-results (after evil activate)
      (evil-motion-state)))
 
-;;; ERT
-
-(evil-add-hjkl-bindings ert-results-mode-map 'motion)
-
 ;;; Info
 
 (evil-add-hjkl-bindings Info-mode-map 'motion
diff --git a/evil-collection.el b/evil-collection.el
index d3a492a..81a1e42 100644
--- a/evil-collection.el
+++ b/evil-collection.el
@@ -86,6 +86,7 @@ or evil-collection.")
     elisp-refs
     emms
     epa
+    ert
     eshell
     eval-sexp-fu
     etags-select