From 9fe7b1fe6a23fb55e6d782293585d58193123f59 Mon Sep 17 00:00:00 2001 From: w0rp Date: Mon, 1 Mar 2021 20:11:10 +0000 Subject: Close #2281 - Separate cwd commands from commands Working directories are now set seperately from the commands so they can later be swapped out when running linters over projects is supported, and also better support filename mapping for running linters on other machines in future. --- .../test_golangci_lint_command_callback.vader | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'test/command_callback/test_golangci_lint_command_callback.vader') diff --git a/test/command_callback/test_golangci_lint_command_callback.vader b/test/command_callback/test_golangci_lint_command_callback.vader index 37fb1f7d..ee754bba 100644 --- a/test/command_callback/test_golangci_lint_command_callback.vader +++ b/test/command_callback/test_golangci_lint_command_callback.vader @@ -12,9 +12,9 @@ After: call ale#assert#TearDownLinterTest() Execute(The golangci-lint defaults should be correct): + AssertLinterCwd '%s:h', AssertLinter 'golangci-lint', - \ ale#path#BufferCdString(bufnr('')) - \ . ale#Escape('golangci-lint') + \ ale#Escape('golangci-lint') \ . ' run ' . ale#Escape(expand('%' . ':t')) \ . ' --enable-all' @@ -22,8 +22,7 @@ Execute(The golangci-lint callback should use a configured executable): let b:ale_go_golangci_lint_executable = 'something else' AssertLinter 'something else', - \ ale#path#BufferCdString(bufnr('')) - \ . ale#Escape('something else') + \ ale#Escape('something else') \ . ' run ' . ale#Escape(expand('%' . ':t')) \ . ' --enable-all' @@ -31,8 +30,7 @@ Execute(The golangci-lint callback should use configured options): let b:ale_go_golangci_lint_options = '--foobar' AssertLinter 'golangci-lint', - \ ale#path#BufferCdString(bufnr('')) - \ . ale#Escape('golangci-lint') + \ ale#Escape('golangci-lint') \ . ' run ' . ale#Escape(expand('%' . ':t')) \ . ' --foobar' @@ -40,8 +38,7 @@ Execute(The golangci-lint callback should support environment variables): let b:ale_go_go111module = 'on' AssertLinter 'golangci-lint', - \ ale#path#BufferCdString(bufnr('')) - \ . ale#Env('GO111MODULE', 'on') + \ ale#Env('GO111MODULE', 'on') \ . ale#Escape('golangci-lint') \ . ' run ' . ale#Escape(expand('%' . ':t')) \ . ' --enable-all' @@ -50,5 +47,4 @@ Execute(The golangci-lint `lint_package` option should use the correct command): let b:ale_go_golangci_lint_package = 1 AssertLinter 'golangci-lint', - \ ale#path#BufferCdString(bufnr('')) - \ . ale#Escape('golangci-lint') . ' run --enable-all' + \ ale#Escape('golangci-lint') . ' run --enable-all' -- cgit v1.2.3