Use Eldev for development

4 files changed, 9 insertions, 43 deletions

diff --git a/test/elpa.el b/test/elpa.el
deleted file mode 100644
index 359ebb9..0000000
--- a/test/elpa.el
+++ /dev/null
@@ -1,5 +0,0 @@
-(setq package-user-dir
-      (expand-file-name (format ".elpa/%s/elpa" emacs-version)))
-(package-initialize)
-(add-to-list 'load-path default-directory)
-
diff --git a/test/make-compile.el b/test/make-compile.el
deleted file mode 100644
index fb097a9..0000000
--- a/test/make-compile.el
+++ /dev/null
@@ -1,3 +0,0 @@
-(setq files '("projectile.el"))
-(setq byte-compile--use-old-handlers nil)
-(mapc #'byte-compile-file files)
diff --git a/test/make-update.el b/test/make-update.el
deleted file mode 100644
index f311da2..0000000
--- a/test/make-update.el
+++ /dev/null
@@ -1,26 +0,0 @@
-(setq package-user-dir
-      (expand-file-name (format ".elpa/%s/elpa" emacs-version)))
-(message "installing in %s ...\n" package-user-dir)
-(package-initialize)
-(setq package-archives
-      '(("melpa" . "http://melpa.org/packages/")
-        ("gnu" . "http://elpa.gnu.org/packages/")))
-(package-refresh-contents)
-
-(defconst dev-packages
-  '(helm noflet ag))
-
-(dolist (package dev-packages)
-  (unless (package-installed-p package)
-    (ignore-errors
-     (package-install package))))
-
-(save-window-excursion
-  (package-list-packages t)
-  (condition-case nil
-      (progn
-        (package-menu-mark-upgrades)
-        (package-menu-execute t))
-    (error
-     (message "All packages up to date"))))
-
diff --git a/test/projectile-test.el b/test/projectile-test.el
index a4f4935..39ce1f8 100644
--- a/test/projectile-test.el
+++ b/test/projectile-test.el
@@ -32,13 +32,13 @@
 (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)))
+(defvar projectile-test-path (let* ((current-file (if load-in-progress load-file-name (buffer-file-name)))
+                                    (source-directory (locate-dominating-file current-file "Eldev"))
+                                    ;; Do not load outdated byte code for tests
+                                    (load-prefer-newer t))
+                               ;; Load the file under test
+                               (load (expand-file-name "projectile" source-directory))
+                               (expand-file-name "test" source-directory)))
 
 ;;; Test Utilities
 (defmacro projectile-test-with-sandbox (&rest body)
@@ -128,9 +128,9 @@ You'd normally combine this with `projectile-test-with-sandbox'."
 
 (describe "projectile-project-type"
   (it "detects the type of Projectile's project"
-    (expect (projectile-project-type) :to-equal 'emacs-cask))
+    (expect (projectile-project-type) :to-equal 'emacs-eldev))
   (it "caches the project type"
-    (expect (gethash (projectile-project-root) projectile-project-type-cache) :to-equal 'emacs-cask)))
+    (expect (gethash (projectile-project-root) projectile-project-type-cache) :to-equal 'emacs-eldev)))
 
 (describe "projectile-ignored-directory-p"
   (it "checks if directory should be ignored"