Merge remote-tracking branch 'upstream/master'

1 files changed, 17 insertions, 6 deletions

diff --git a/test/command_callback/test_vint_command_callback.vader b/test/command_callback/test_vint_command_callback.vader
index 4ce277e8..4a224d01 100644
--- a/test/command_callback/test_vint_command_callback.vader
+++ b/test/command_callback/test_vint_command_callback.vader
@@ -1,17 +1,17 @@
 Before:
   call ale#assert#SetUpLinterTest('vim', 'vint')
-  let b:command_tail = (has('nvim') ? ' --enable-neovim' : '')
-  \ . ' -f "{file_path}:{line_number}:{column_number}: {severity}: {policy_name} - {description} (see {reference})" %t'
+  let b:common_flags = (has('nvim') ? ' --enable-neovim' : '')
+  \ . ' -f "{file_path}:{line_number}:{column_number}: {severity}: {policy_name} - {description} (see {reference})"'
 
 After:
-  unlet! b:bin_dir
-  unlet! b:executable
+  unlet! b:common_flags
+
   call ale#assert#TearDownLinterTest()
 
 Execute(The default command should be correct):
   AssertLinter 'vint', [
   \ ale#Escape('vint') .' --version',
-  \ ale#Escape('vint') .' -s --no-color' . b:command_tail,
+  \ ale#Escape('vint') .' -s --no-color' . b:common_flags . ' %t',
   \]
 
 Execute(The executable should be configurable):
@@ -19,5 +19,16 @@ Execute(The executable should be configurable):
 
   AssertLinter 'foobar', [
   \ ale#Escape('foobar') .' --version',
-  \ ale#Escape('foobar') .' -s --no-color' . b:command_tail,
+  \ ale#Escape('foobar') .' -s --no-color' . b:common_flags . ' %t',
   \]
+
+Execute(The --no-color flag should not be used for older Vint versions):
+  GivenCommandOutput ['v0.3.5']
+
+  AssertLinter 'vint', ale#Escape('vint') .' -s' . b:common_flags . ' %t'
+
+Execute(--stdin-display-name should be used in newer versions):
+  GivenCommandOutput ['v0.4.0']
+
+  AssertLinter 'vint', ale#Escape('vint') .' -s --no-color' . b:common_flags
+  \ . ' --stdin-display-name %s -'