From 5917de565d4e89c73e69727848b7fba3e2730c57 Mon Sep 17 00:00:00 2001 From: w0rp Date: Thu, 26 Oct 2017 00:48:51 +0100 Subject: Fix #491 - Use -x for shellcheck for checking files with sourced files --- .../test_shellcheck_command_callback.vader | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'test/command_callback/test_shellcheck_command_callback.vader') diff --git a/test/command_callback/test_shellcheck_command_callback.vader b/test/command_callback/test_shellcheck_command_callback.vader index 8e229056..13e9a2c1 100644 --- a/test/command_callback/test_shellcheck_command_callback.vader +++ b/test/command_callback/test_shellcheck_command_callback.vader @@ -9,6 +9,12 @@ Before: runtime ale_linters/sh/shellcheck.vim + call ale#test#SetDirectory('/testplugin/test/command_callback') + call ale#test#SetFilename('test.sh') + + let b:prefix = 'cd ' . ale#Escape(ale#path#Winify(g:dir)) . ' && ' + let b:suffix = ' -x -f gcc -' + After: Restore @@ -16,19 +22,22 @@ After: unlet! b:ale_sh_shellcheck_executable unlet! b:ale_sh_shellcheck_options unlet! b:is_bash + unlet! b:prefix + + call ale#test#RestoreDirectory() call ale#linter#Reset() Execute(The default shellcheck command should be correct): AssertEqual - \ 'shellcheck -f gcc -', + \ b:prefix . ale#Escape('shellcheck') . b:suffix, \ ale_linters#sh#shellcheck#GetCommand(bufnr('')) Execute(The shellcheck command should accept options): let b:ale_sh_shellcheck_options = '--foobar' AssertEqual - \ 'shellcheck --foobar -f gcc -', + \ b:prefix . ale#Escape('shellcheck') . ' --foobar' . b:suffix, \ ale_linters#sh#shellcheck#GetCommand(bufnr('')) Execute(The shellcheck command should accept options and exclusions): @@ -36,14 +45,14 @@ Execute(The shellcheck command should accept options and exclusions): let b:ale_sh_shellcheck_exclusions = 'foo,bar' AssertEqual - \ 'shellcheck --foobar -e foo,bar -f gcc -', + \ b:prefix . ale#Escape('shellcheck') . ' --foobar -e foo,bar' . b:suffix, \ ale_linters#sh#shellcheck#GetCommand(bufnr('')) Execute(The shellcheck command should include the dialect): let b:is_bash = 1 AssertEqual - \ 'shellcheck -s bash -f gcc -', + \ b:prefix . ale#Escape('shellcheck') . ' -s bash' . b:suffix, \ ale_linters#sh#shellcheck#GetCommand(bufnr('')) Execute(The shellcheck command should include the dialect before options and exclusions): @@ -52,5 +61,8 @@ Execute(The shellcheck command should include the dialect before options and exc let b:ale_sh_shellcheck_exclusions = 'foo,bar' AssertEqual - \ 'shellcheck -s bash --foobar -e foo,bar -f gcc -', + \ b:prefix + \ . ale#Escape('shellcheck') + \ . ' -s bash --foobar -e foo,bar' + \ . b:suffix, \ ale_linters#sh#shellcheck#GetCommand(bufnr('')) -- cgit v1.2.3