summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Brown <github@muglug.com>2018-10-19 16:31:12 -0400
committerMatt Brown <github@muglug.com>2018-10-19 16:31:12 -0400
commit7fa0d3dcc47a03c54c4450377ef8053b32e0139a (patch)
treebb6632351921c7c9e20a1050ff38736f1ad86d94
parent0ed07a9ef52b5f8ac528eadb5252ed091db53265 (diff)
downloadale-7fa0d3dcc47a03c54c4450377ef8053b32e0139a.zip
Add tests for updated Psalm plugin
-rwxr-xr-xtest/command_callback/psalm-project/vendor/bin/psalm-language-server0
-rw-r--r--test/command_callback/test_psalm_command_callbacks.vader25
-rw-r--r--test/handler/test_php_psalm_handler.vader24
3 files changed, 21 insertions, 28 deletions
diff --git a/test/command_callback/psalm-project/vendor/bin/psalm-language-server b/test/command_callback/psalm-project/vendor/bin/psalm-language-server
new file mode 100755
index 00000000..e69de29b
--- /dev/null
+++ b/test/command_callback/psalm-project/vendor/bin/psalm-language-server
diff --git a/test/command_callback/test_psalm_command_callbacks.vader b/test/command_callback/test_psalm_command_callbacks.vader
index 4c31b7b4..d731054f 100644
--- a/test/command_callback/test_psalm_command_callbacks.vader
+++ b/test/command_callback/test_psalm_command_callbacks.vader
@@ -2,11 +2,28 @@ Before:
call ale#assert#SetUpLinterTest('php', 'psalm')
After:
+ if isdirectory(g:dir . '/.git')
+ call delete(g:dir . '/.git', 'd')
+ endif
+
call ale#assert#TearDownLinterTest()
-Execute(Custom executables should be used for the executable and command):
- let g:ale_php_psalm_executable = 'psalm_test'
+Execute(The default executable path should be correct):
+ AssertLinter 'psalm-language-server',
+ \ ale#Escape('psalm-language-server')
+
+Execute(Vendor executables should be detected):
+ call ale#test#SetFilename('psalm-project/test.php')
+
+ AssertLinter
+ \ ale#path#Simplify(g:dir . '/psalm-project/vendor/bin/psalm-language-server'),
+ \ ale#Escape(ale#path#Simplify(
+ \ g:dir
+ \ . '/psalm-project/vendor/bin/psalm-language-server'
+ \ ))
- AssertLinter 'psalm_test',
- \ ale#Escape('psalm_test') . ' --diff --output-format=emacs %s'
+Execute(The project path should be correct for .git directories):
+ call ale#test#SetFilename('psalm-project/test.php')
+ call mkdir(g:dir . '/.git')
+ AssertLSPProject g:dir \ No newline at end of file
diff --git a/test/handler/test_php_psalm_handler.vader b/test/handler/test_php_psalm_handler.vader
deleted file mode 100644
index fd62a467..00000000
--- a/test/handler/test_php_psalm_handler.vader
+++ /dev/null
@@ -1,24 +0,0 @@
-Before:
- runtime ale_linters/php/psalm.vim
-
-After:
- call ale#linter#Reset()
-
-Execute(The php static analyzer handler should parse errors from psalm):
- AssertEqual
- \ [
- \ {
- \ 'lnum': 1,
- \ 'type': 'W',
- \ 'text': 'somewarning',
- \ },
- \ {
- \ 'lnum': 11,
- \ 'type': 'E',
- \ 'text': 'someerror',
- \ },
- \ ],
- \ ale_linters#php#psalm#Handle(347, [
- \ "/file:1:3:warning - somewarning",
- \ "/file:11:33:error - someerror",
- \ ])