merge master -- apparently someone else added dhall?

1 files changed, 7 insertions, 6 deletions

diff --git a/test/command_callback/test_pydocstyle_command_callback.vader b/test/command_callback/test_pydocstyle_command_callback.vader
index 7e0df9ca..511443a6 100644
--- a/test/command_callback/test_pydocstyle_command_callback.vader
+++ b/test/command_callback/test_pydocstyle_command_callback.vader
@@ -1,5 +1,6 @@
 Before:
   call ale#assert#SetUpLinterTest('python', 'pydocstyle')
+  call ale#test#SetFilename('test.py')
 
 After:
   call ale#assert#TearDownLinterTest()
@@ -7,33 +8,33 @@ After:
 Execute(The pydocstyle command callback should return default string):
   AssertLinter 'pydocstyle',
   \ ale#path#BufferCdString(bufnr(''))
-  \   . ale#Escape('pydocstyle') . '  ' . ale#Escape('dummy.txt')
+  \   . ale#Escape('pydocstyle') . ' %s:t'
 
 Execute(The pydocstyle command callback should allow options):
   let g:ale_python_pydocstyle_options = '--verbose'
 
   AssertLinter 'pydocstyle',
   \ ale#path#BufferCdString(bufnr(''))
-  \   . ale#Escape('pydocstyle') . ' --verbose ' . ale#Escape('dummy.txt')
+  \   . ale#Escape('pydocstyle') . ' --verbose %s:t'
 
 Execute(The pydocstyle executable should be configurable):
   let g:ale_python_pydocstyle_executable = '~/.local/bin/pydocstyle'
 
   AssertLinter '~/.local/bin/pydocstyle',
   \ ale#path#BufferCdString(bufnr(''))
-  \   . ale#Escape('~/.local/bin/pydocstyle') . '  ' . ale#Escape('dummy.txt')
+  \   . ale#Escape('~/.local/bin/pydocstyle') . ' %s:t'
 
 Execute(Setting executable to 'pipenv' appends 'run pydocstyle'):
   let g:ale_python_pydocstyle_executable = 'path/to/pipenv'
 
   AssertLinter 'path/to/pipenv',
   \ ale#path#BufferCdString(bufnr(''))
-  \   . ale#Escape('path/to/pipenv') . ' run pydocstyle  ' . ale#Escape('dummy.txt')
+  \   . ale#Escape('path/to/pipenv') . ' run pydocstyle %s:t'
 
 Execute(Pipenv is detected when python_pydocstyle_auto_pipenv is set):
   let g:ale_python_pydocstyle_auto_pipenv = 1
-  call ale#test#SetFilename('/testplugin/test/python_fixtures/pipenv/whatever.py')
+  call ale#test#SetFilename('../python_fixtures/pipenv/whatever.py')
 
   AssertLinter 'pipenv',
   \ ale#path#BufferCdString(bufnr(''))
-  \   . ale#Escape('pipenv') . ' run pydocstyle  ' . ale#Escape('whatever.py')
+  \   . ale#Escape('pipenv') . ' run pydocstyle %s:t'