#659 - Add options for Python fixers, and cut down on duplicated documentation

4 files changed, 97 insertions, 58 deletions

diff --git a/test/fixers/test_autopep8_fixer_callback.vader b/test/fixers/test_autopep8_fixer_callback.vader
new file mode 100644
index 00000000..3b5b057c
--- /dev/null
+++ b/test/fixers/test_autopep8_fixer_callback.vader
@@ -0,0 +1,39 @@
+Before:
+  Save g:ale_python_autopep8_executable
+  Save g:ale_python_autopep8_options
+
+  " Use an invalid global executable, so we don't match it.
+  let g:ale_python_autopep8_executable = 'xxxinvalid'
+  let g:ale_python_autopep8_options = ''
+
+  silent! execute 'cd /testplugin/test/command_callback'
+  silent cd ..
+  silent cd command_callback
+  let g:dir = getcwd()
+
+After:
+  Restore
+
+  silent execute 'cd ' . fnameescape(g:dir)
+  " Set the file to something else,
+  " or we'll cause issues when running other tests
+  silent file 'dummy.py'
+  unlet! g:dir
+
+Execute(The autopep8 callback should return the correct default values):
+  AssertEqual
+  \ 0,
+  \ ale#fixers#autopep8#Fix(bufnr(''))
+
+  silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
+  AssertEqual
+  \ {'command': "'" . g:dir . "/python_paths/with_virtualenv/env/bin/autopep8' -" },
+  \ ale#fixers#autopep8#Fix(bufnr(''))
+
+Execute(The autopep8 callback should include options):
+  let g:ale_python_autopep8_options = '--some-option'
+
+  silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
+  AssertEqual
+  \ {'command': "'" . g:dir . "/python_paths/with_virtualenv/env/bin/autopep8' --some-option -" },
+  \ ale#fixers#autopep8#Fix(bufnr(''))
diff --git a/test/fixers/test_isort_fixer_callback.vader b/test/fixers/test_isort_fixer_callback.vader
new file mode 100644
index 00000000..495f23c5
--- /dev/null
+++ b/test/fixers/test_isort_fixer_callback.vader
@@ -0,0 +1,29 @@
+Before:
+  Save g:ale_python_isort_executable
+
+  " Use an invalid global executable, so we don't match it.
+  let g:ale_python_isort_executable = 'xxxinvalid'
+
+  silent! execute 'cd /testplugin/test/command_callback'
+  silent cd ..
+  silent cd command_callback
+  let g:dir = getcwd()
+
+After:
+  Restore
+
+  silent execute 'cd ' . fnameescape(g:dir)
+  " Set the file to something else,
+  " or we'll cause issues when running other tests
+  silent file 'dummy.py'
+  unlet! g:dir
+
+Execute(The isort callback should return the correct default values):
+  AssertEqual
+  \ 0,
+  \ ale#fixers#isort#Fix(bufnr(''))
+
+  silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
+  AssertEqual
+  \ {'command': "'" . g:dir . "/python_paths/with_virtualenv/env/bin/isort' -" },
+  \ ale#fixers#isort#Fix(bufnr(''))
diff --git a/test/fixers/test_python_fixer_command_callback.vader b/test/fixers/test_python_fixer_command_callback.vader
deleted file mode 100644
index 7ee0cafe..00000000
--- a/test/fixers/test_python_fixer_command_callback.vader
+++ /dev/null
@@ -1,58 +0,0 @@
-Before:
-  silent! execute 'cd /testplugin/test/command_callback'
-  let g:dir = getcwd()
-
-After:
-  " Set the file to something else,
-  " or we'll cause issues when running other tests
-  silent file 'dummy.py'
-  unlet! g:dir
-
-Execute(The python GetExecutable callbacks should return the correct path):
-  AssertEqual
-  \ '',
-  \ ale#python#GetExecutable(bufnr(''), 'isort')
-
-  silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
-  AssertEqual
-  \ g:dir . '/python_paths/with_virtualenv/env/bin/isort',
-  \ ale#python#GetExecutable(bufnr(''), 'isort')
-  AssertEqual
-  \ g:dir . '/python_paths/with_virtualenv/env/bin/autopep8',
-  \ ale#python#GetExecutable(bufnr(''), 'autopep8')
-  AssertEqual
-  \ g:dir . '/python_paths/with_virtualenv/env/bin/yapf',
-  \ ale#python#GetExecutable(bufnr(''), 'yapf')
-
-
-Execute(The autopep8 callbacks should return the correct default values):
-  AssertEqual
-  \ 0,
-  \ ale#fixers#autopep8#Fix(bufnr(''))
-
-  silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
-  AssertEqual
-  \ {'command': "'" . g:dir . "/python_paths/with_virtualenv/env/bin/autopep8' -" },
-  \ ale#fixers#autopep8#Fix(bufnr(''))
-
-
-Execute(The isort callbacks should return the correct default values):
-  AssertEqual
-  \ 0,
-  \ ale#fixers#isort#Fix(bufnr(''))
-
-  silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
-  AssertEqual
-  \ {'command': "'" . g:dir . "/python_paths/with_virtualenv/env/bin/isort' -" },
-  \ ale#fixers#isort#Fix(bufnr(''))
-
-
-Execute(The yapf callbacks should return the correct default values):
-  AssertEqual
-  \ 0,
-  \ ale#fixers#yapf#Fix(bufnr(''))
-
-  silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
-  AssertEqual
-  \ {'command': "'" . g:dir . "/python_paths/with_virtualenv/env/bin/yapf' --no-local-style" },
-  \ ale#fixers#yapf#Fix(bufnr(''))
diff --git a/test/fixers/test_yapf_fixer_callback.vader b/test/fixers/test_yapf_fixer_callback.vader
new file mode 100644
index 00000000..0b88e4d8
--- /dev/null
+++ b/test/fixers/test_yapf_fixer_callback.vader
@@ -0,0 +1,29 @@
+Before:
+  Save g:ale_python_yapf_executable
+
+  " Use an invalid global executable, so we don't match it.
+  let g:ale_python_yapf_executable = 'xxxinvalid'
+
+  silent! execute 'cd /testplugin/test/command_callback'
+  silent cd ..
+  silent cd command_callback
+  let g:dir = getcwd()
+
+After:
+  Restore
+
+  silent execute 'cd ' . fnameescape(g:dir)
+  " Set the file to something else,
+  " or we'll cause issues when running other tests
+  silent file 'dummy.py'
+  unlet! g:dir
+
+Execute(The yapf callback should return the correct default values):
+  AssertEqual
+  \ 0,
+  \ ale#fixers#yapf#Fix(bufnr(''))
+
+  silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
+  AssertEqual
+  \ {'command': "'" . g:dir . "/python_paths/with_virtualenv/env/bin/yapf' --no-local-style" },
+  \ ale#fixers#yapf#Fix(bufnr(''))