Done with merge stuff
This commit is contained in:
parent
dee0a46c08
commit
03fef302ec
|
@ -12,8 +12,6 @@
|
|||
(should (equal (expand-file-name "~/plantuml.jar")
|
||||
plantuml-jar-path)))
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
(ert-deftest can-unload-plantuml ()
|
||||
(unload-feature 'plantuml-mode t)
|
||||
(should (eq nil (boundp 'plantuml-jar-path)))
|
||||
|
@ -32,7 +30,6 @@
|
|||
|
||||
(load-plantuml-mode))
|
||||
|
||||
>>>>>>> develop
|
||||
(provide 'plantuml-mode-test)
|
||||
|
||||
;;; plantuml-mode-test.el ends here
|
||||
|
|
|
@ -23,10 +23,7 @@
|
|||
|
||||
(ert-deftest preview-unicode-test ()
|
||||
(setq-local plantuml-jar-path plantuml-test-jar-path)
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
(setq-local plantuml-output-type "utxt")
|
||||
>>>>>>> develop
|
||||
(assert-preview "unicode.puml" "unicode.txt"))
|
||||
|
||||
(provide 'plantuml-mode-preview-test)
|
||||
|
|
|
@ -32,13 +32,7 @@
|
|||
(defun read-test-file (path)
|
||||
(f-read (f-join plantuml-test-resources-path path) 'utf-8))
|
||||
|
||||
<<<<<<< HEAD
|
||||
(require 'plantuml-mode (f-expand "plantuml-mode.el" package-code-path))
|
||||
=======
|
||||
(defun load-plantuml-mode ()
|
||||
(require 'plantuml-mode (f-expand "plantuml-mode.el" package-code-path)))
|
||||
|
||||
(load-plantuml-mode)
|
||||
>>>>>>> develop
|
||||
|
||||
;;; test-helper.el ends here
|
||||
|
|
Loading…
Reference in New Issue