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.

1 files changed, 6 insertions, 10 deletions

diff --git a/test/command_callback/test_phpcs_command_callback.vader b/test/command_callback/test_phpcs_command_callback.vader
index 48a599e4..35d59777 100644
--- a/test/command_callback/test_phpcs_command_callback.vader
+++ b/test/command_callback/test_phpcs_command_callback.vader
@@ -11,8 +11,8 @@ Execute(The local phpcs executable should be used):
 
   let g:executable = ale#path#Simplify(g:dir . '/../phpcs-test-files/project-with-phpcs/vendor/bin/phpcs')
 
-  AssertLinter g:executable, ale#path#BufferCdString(bufnr(''))
-  \ . ale#Escape(g:executable)
+  AssertLinterCwd '%s:h'
+  AssertLinter g:executable, ale#Escape(g:executable)
   \ . ' -s --report=emacs --stdin-path=%s'
 
 Execute(use_global should override local executable detection):
@@ -20,27 +20,23 @@ Execute(use_global should override local executable detection):
 
   call ale#test#SetFilename('../phpcs-test-files/project-with-phpcs/foo/test.php')
 
-  AssertLinter 'phpcs', ale#path#BufferCdString(bufnr(''))
-  \ . ale#Escape('phpcs')
+  AssertLinter 'phpcs', ale#Escape('phpcs')
   \ . ' -s --report=emacs --stdin-path=%s'
 
 Execute(Projects without local executables should use the global one):
   call ale#test#SetFilename('../phpcs-test-files/project-without-phpcs/foo/test.php')
 
-  AssertLinter 'phpcs', ale#path#BufferCdString(bufnr(''))
-  \ . ale#Escape('phpcs')
+  AssertLinter 'phpcs', ale#Escape('phpcs')
   \ . ' -s --report=emacs --stdin-path=%s'
 
 Execute(User provided options should be used):
   let g:ale_php_phpcs_options = '--my-user-provided-option my-value'
 
-  AssertLinter 'phpcs', ale#path#BufferCdString(bufnr(''))
-  \ . ale#Escape('phpcs')
+  AssertLinter 'phpcs', ale#Escape('phpcs')
   \ . ' -s --report=emacs --stdin-path=%s --my-user-provided-option my-value'
 
 Execute(The _standard option should be used):
   let g:ale_php_phpcs_standard = 'foobar'
 
-  AssertLinter 'phpcs', ale#path#BufferCdString(bufnr(''))
-  \ . ale#Escape('phpcs')
+  AssertLinter 'phpcs', ale#Escape('phpcs')
   \ . ' -s --report=emacs --stdin-path=%s --standard=' . ale#Escape('foobar')