Remove the ert-runner test helper

2 files changed, 11 insertions, 36 deletions

diff --git a/test/projectile-test.el b/test/projectile-test.el
index a1a646b..ea3ee8b 100644
--- a/test/projectile-test.el
+++ b/test/projectile-test.el
@@ -28,6 +28,17 @@
 (require 'projectile)
 (require 'buttercup)
 
+(message "Running tests on Emacs %s" emacs-version)
+
+;; TODO: Revise this init logic
+(let* ((current-file (if load-in-progress load-file-name (buffer-file-name)))
+       (source-directory (locate-dominating-file current-file "Cask"))
+       ;; Do not load outdated byte code for tests
+       (load-prefer-newer t))
+  ;; Load the file under test
+  (load (expand-file-name "projectile" source-directory))
+  (setq projectile-test-path (expand-file-name "test" source-directory)))
+
 ;;; Test Utilities
 (defmacro projectile-test-with-sandbox (&rest body)
   "Evaluate BODY in an empty temporary directory."
diff --git a/test/test-helper.el b/test/test-helper.el
deleted file mode 100644
index d5b88a4..0000000
--- a/test/test-helper.el
+++ /dev/null
@@ -1,36 +0,0 @@
-;;; test-helper.el --- Projectile: Non-interactive unit-test setup  -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2018 Bozhidar Batsov <bozhidar@batsov.com>
-
-;; This file is not part of GNU Emacs.
-
-;; 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:
-
-;; Non-interactive test suite setup for ERT Runner.
-
-;;; Code:
-
-(message "Running tests on Emacs %s" emacs-version)
-
-(let* ((current-file (if load-in-progress load-file-name (buffer-file-name)))
-       (source-directory (locate-dominating-file current-file "Cask"))
-       ;; Do not load outdated byte code for tests
-       (load-prefer-newer t))
-  ;; Load the file under test
-  (load (expand-file-name "projectile" source-directory))
-  (setq projectile-test-path (expand-file-name "test" source-directory)))
-
-;;; test-helper.el ends here