summaryrefslogtreecommitdiff
path: root/test/command_callback
diff options
context:
space:
mode:
authorw0rp <w0rp@users.noreply.github.com>2019-10-07 19:19:54 +0100
committerGitHub <noreply@github.com>2019-10-07 19:19:54 +0100
commitcebbb67ea6e2555f4438d61333c96764a389cf6b (patch)
tree5752cccc0eef1eb7a32290c17b598b765b212c1e /test/command_callback
parent32b784219b91a99fb05a78825ce64c5a4f98f253 (diff)
parente47c1965a611e5d8e4503ed399fefbb41caa80c4 (diff)
downloadale-cebbb67ea6e2555f4438d61333c96764a389cf6b.zip
Merge pull request #2659 from greg0ire/psalm-language-server-option
Use the psalm executable with the LS option
Diffstat (limited to 'test/command_callback')
-rwxr-xr-xtest/command_callback/psalm-project/vendor/bin/psalm (renamed from test/command_callback/psalm-project/vendor/bin/psalm-language-server)0
-rw-r--r--test/command_callback/test_psalm_command_callbacks.vader10
2 files changed, 5 insertions, 5 deletions
diff --git a/test/command_callback/psalm-project/vendor/bin/psalm-language-server b/test/command_callback/psalm-project/vendor/bin/psalm
index e69de29b..e69de29b 100755
--- a/test/command_callback/psalm-project/vendor/bin/psalm-language-server
+++ b/test/command_callback/psalm-project/vendor/bin/psalm
diff --git a/test/command_callback/test_psalm_command_callbacks.vader b/test/command_callback/test_psalm_command_callbacks.vader
index 33d770c2..74c68d43 100644
--- a/test/command_callback/test_psalm_command_callbacks.vader
+++ b/test/command_callback/test_psalm_command_callbacks.vader
@@ -9,18 +9,18 @@ After:
call ale#assert#TearDownLinterTest()
Execute(The default executable path should be correct):
- AssertLinter 'psalm-language-server',
- \ ale#Escape('psalm-language-server')
+ AssertLinter 'psalm',
+ \ 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#path#Simplify(g:dir . '/psalm-project/vendor/bin/psalm'),
\ ale#Escape(ale#path#Simplify(
\ g:dir
- \ . '/psalm-project/vendor/bin/psalm-language-server'
- \ ))
+ \ . '/psalm-project/vendor/bin/psalm'
+ \ )) . ' --language-server'
Execute(The project path should be correct for .git directories):
call ale#test#SetFilename('psalm-project/test.php')