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, 21 insertions, 20 deletions

diff --git a/test/command_callback/test_mypy_command_callback.vader b/test/command_callback/test_mypy_command_callback.vader
index 3a26373f..1a0f5301 100644
--- a/test/command_callback/test_mypy_command_callback.vader
+++ b/test/command_callback/test_mypy_command_callback.vader
@@ -11,8 +11,9 @@ After:
   call ale#assert#TearDownLinterTest()
 
 Execute(The mypy callbacks should return the correct default values):
+  AssertLinterCwd g:dir
   AssertLinter 'mypy',
-  \ ale#path#CdString(g:dir) . ale#Escape('mypy')
+  \ ale#Escape('mypy')
   \   . ' --show-column-numbers'
   \   . ' --shadow-file %s %t %s'
 
@@ -20,7 +21,7 @@ Execute(The mypy executable should be configurable, and escaped properly):
   let g:ale_python_mypy_executable = 'executable with spaces'
 
   AssertLinter 'executable with spaces',
-  \ ale#path#CdString(g:dir) . ale#Escape('executable with spaces')
+  \ ale#Escape('executable with spaces')
   \   . ' --show-column-numbers'
   \   . ' --shadow-file %s %t %s'
 
@@ -28,62 +29,62 @@ Execute(The mypy command callback should let you set options):
   let g:ale_python_mypy_options = '--some-option'
 
   AssertLinter 'mypy',
-  \ ale#path#CdString(g:dir) . ale#Escape('mypy')
+  \ ale#Escape('mypy')
   \   . ' --some-option'
   \   . ' --show-column-numbers'
   \   . ' --shadow-file %s %t %s'
 
 Execute(The mypy command should switch directories to the detected project root):
-  silent execute 'file ' . fnameescape(g:dir . '/python_paths/no_virtualenv/subdir/foo/bar.py')
+  call ale#test#SetFilename('python_paths/no_virtualenv/subdir/foo/bar.py')
 
+  AssertLinterCwd ale#path#Simplify(g:dir . '/python_paths/no_virtualenv/subdir')
   AssertLinter 'mypy',
-  \ ale#path#CdString(ale#path#Simplify(g:dir . '/python_paths/no_virtualenv/subdir'))
-  \   . ale#Escape('mypy')
+  \   ale#Escape('mypy')
   \   . ' --show-column-numbers'
   \   . ' --shadow-file %s %t %s'
 
 Execute(The mypy callbacks should detect virtualenv directories and switch to the project root):
-  silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
+  call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py')
 
   let b:executable = ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/mypy')
 
+  AssertLinterCwd ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir')
   AssertLinter b:executable,
-  \   ale#path#CdString(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir'))
-  \   . ale#Escape(b:executable)
+  \ ale#Escape(b:executable)
   \   . ' --show-column-numbers'
   \   . ' --shadow-file %s %t %s'
 
 Execute(The mypy callbacks should cd to directory containing mypy.ini if found):
-  silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_mypy_ini_and_pytest_ini/tests/testsubfolder/my_tests.py')
+  call ale#test#SetFilename('python_paths/with_mypy_ini_and_pytest_ini/tests/testsubfolder/my_tests.py')
 
+  AssertLinterCwd ale#path#Simplify(g:dir . '/python_paths/with_mypy_ini_and_pytest_ini')
   AssertLinter 'mypy',
-  \   ale#path#CdString(ale#path#Simplify(g:dir . '/python_paths/with_mypy_ini_and_pytest_ini'))
-  \   . ale#Escape('mypy')
+  \ ale#Escape('mypy')
   \   . ' --show-column-numbers'
   \   . ' --shadow-file %s %t %s'
 
 Execute(You should able able to use the global mypy instead):
-  silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
+  call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py')
   let g:ale_python_mypy_use_global = 1
 
+  AssertLinterCwd ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir')
   AssertLinter 'mypy',
-  \   ale#path#CdString(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir'))
-  \   . ale#Escape('mypy')
+  \ ale#Escape('mypy')
   \   . ' --show-column-numbers'
   \   . ' --shadow-file %s %t %s'
 
 Execute(Setting executable to 'pipenv' appends 'run mypy'):
   let g:ale_python_mypy_executable = 'path/to/pipenv'
 
+  AssertLinterCwd expand('#' . bufnr('') . ':p:h')
   AssertLinter 'path/to/pipenv',
-  \ ale#path#CdString(expand('#' . bufnr('') . ':p:h'))
-  \   . ale#Escape('path/to/pipenv') . ' run mypy'
+  \ ale#Escape('path/to/pipenv') . ' run mypy'
   \   . ' --show-column-numbers --shadow-file %s %t %s'
 
 Execute(Pipenv is detected when python_mypy_auto_pipenv is set):
-  let g:ale_python_mypy_auto_pipenv = 1
   call ale#test#SetFilename('../python_fixtures/pipenv/whatever.py')
+  let g:ale_python_mypy_auto_pipenv = 1
 
+  AssertLinterCwd expand('#' . bufnr('') . ':p:h')
   AssertLinter 'pipenv',
-  \ ale#path#CdString(expand('#' . bufnr('') . ':p:h'))
-  \   . ale#Escape('pipenv') . ' run mypy --show-column-numbers --shadow-file %s %t %s'
+  \ ale#Escape('pipenv') . ' run mypy --show-column-numbers --shadow-file %s %t %s'