1 files changed, 6 insertions, 14 deletions
diff --git a/test/command_callback/test_gobuild_command_callback.vader b/test/command_callback/test_gobuild_command_callback.vader
index 063f3f2f..bac4d74e 100644
--- a/test/command_callback/test_gobuild_command_callback.vader
+++ b/test/command_callback/test_gobuild_command_callback.vader
@@ -9,33 +9,25 @@ After:
   Restore
   call ale#assert#TearDownLinterTest()
 
-Execute(The default commands should be correct):
-  AssertLinter 'go',
-  \ ale#path#BufferCdString(bufnr(''))
-  \   . 'go test -c -o /dev/null ./'
+Execute(The default command should be correct):
+  AssertLinterCwd '%s:h'
+  AssertLinter 'go', 'go test -c -o /dev/null ./'
 
 Execute(Go environment variables should be supported):
   let b:ale_go_go111module = 'on'
 
-  AssertLinter 'go',
-  \ ale#path#BufferCdString(bufnr(''))
-  \   . ale#Env('GO111MODULE', 'on')
-  \   . 'go test -c -o /dev/null ./'
+  AssertLinter 'go', ale#Env('GO111MODULE', 'on') . 'go test -c -o /dev/null ./'
 
   unlet! b:ale_go_go111module
 
 Execute(Extra options should be supported):
   let g:ale_go_gobuild_options = '--foo-bar'
 
-  AssertLinter 'go',
-  \ ale#path#BufferCdString(bufnr(''))
-  \   . 'go test --foo-bar -c -o /dev/null ./'
+  AssertLinter 'go', 'go test --foo-bar -c -o /dev/null ./'
 
   let g:ale_go_gobuild_options = ''
 
 Execute(The executable should be configurable):
   let g:ale_go_go_executable = 'foobar'
 
-  AssertLinter 'foobar',
-  \ ale#path#BufferCdString(bufnr(''))
-  \   . 'foobar test -c -o /dev/null ./'
+  AssertLinter 'foobar', 'foobar test -c -o /dev/null ./'