fix vc bug and test cases

Author: jaypei

Makefile

@@ -16,6 +16,7 @@ test: compile
 		-l test/test-utils.el \
 		-l test/test-cmds.el \
 		-l test/test-buffer.el \
+		-l test/test-vc.el \
 		--eval "(let (pop-up-windows) (ert t))"
 
 test-batch: compile

neotree.el

@@ -1178,8 +1178,7 @@ PATH is value."
 
 (defun neo-buffer--insert-file-entry (node depth)
   (let ((node-short-name (neo-path--file-short-name node))
-        (vc (or neo-vc-integration (neo-vc-for-node node)
-                ?\s)))
+        (vc (when neo-vc-integration (neo-vc-for-node node))))
     (insert-char ?\s (* (- depth 1) 2)) ; indent
     (when (memq 'char neo-vc-integration)
       (insert-char (car vc))

test/neotree-test.el

@@ -31,6 +31,17 @@
          (let ((default-directory temp-cwd)) ,@body)
        (delete-directory temp-cwd t))))
 
+(defun neo-test--with-temp-dir-open ()
+  (neo-test--with-temp-dir
+    (write-region "" nil "file-1")
+    (write-region "hello" nil "file-2")
+    (neotree-dir temp-cwd)))
+
+(defmacro neo-test--try-open (name &rest body)
+  (declare (indent 0) (debug t))
+  `(ert-deftest ,name ()
+     ,@body
+     (neo-test--with-temp-dir-open)))
 
 (provide 'neotree-test)
 ;;; neotree-test.el ends here

test/test-vc.el

@@ -0,0 +1,44 @@
+;;; test-vc.el --- test cases
+
+;; Copyright (C) 2014 jaypei
+
+;; Author: jaypei <[email protected]>
+;; URL: https://github.com/jaypei/emacs-neotree
+
+;; 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:
+
+;;; Code:
+
+(require 'neotree)
+(require 'neotree-test)
+
+(neo-test--try-open
+ neo-test-vc-mode-with-face
+ (shell-command-to-string "git init")
+ (setq neo-vc-integration '(face)))
+
+(neo-test--try-open
+ neo-test-vc-mode-with-char
+ (shell-command-to-string "git init")
+ (setq neo-vc-integration '(char)))
+
+(neo-test--try-open
+ neo-test-vc-mode-with-char-face
+ (shell-command-to-string "git init")
+ (setq neo-vc-integration '(char face)))
+
+
+;;; test-vc.el ends here