6 files changed, 47 insertions, 15 deletions
diff --git a/test/fixers/test_clangtidy_fixer_callback.vader b/test/fixers/test_clangtidy_fixer_callback.vader
index 68416b36..ca08e6bc 100644
--- a/test/fixers/test_clangtidy_fixer_callback.vader
+++ b/test/fixers/test_clangtidy_fixer_callback.vader
@@ -1,8 +1,19 @@
 Before:
+  Save g:ale_c_build_dir
   Save g:ale_c_clangtidy_executable
+  Save g:ale_c_clangtidy_checks
+  Save g:ale_c_clangtidy_extra_options
+  Save g:ale_cpp_clangtidy_executable
+  Save g:ale_cpp_clangtidy_checks
+  Save g:ale_cpp_clangtidy_extra_options
 
   " Use an invalid global executable, so we don't match it.
   let g:ale_c_clangtidy_executable = 'xxxinvalid'
+  let g:ale_c_clangtidy_checks = []
+  let g:ale_c_clangtidy_extra_options = ''
+  let g:ale_cpp_clangtidy_executable = 'xxxinvalidpp'
+  let g:ale_cpp_clangtidy_checks = []
+  let g:ale_cpp_clangtidy_extra_options = ''
   let g:ale_c_build_dir = ''
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
@@ -36,16 +47,3 @@ Execute(The clangtidy callback should include any additional options):
   \     . ' -fix -fix-errors --some-option %t',
   \ },
   \ ale#fixers#clangtidy#Fix(bufnr(''))
-
-Execute(The clangtidy callback should support cpp files):
-  call ale#test#SetFilename('c_paths/dummy.cpp')
-  let g:ale_cpp_clangtidy_executable = 'invalidpp'
-  set filetype=cpp " The test fails without this
-
-  AssertEqual
-  \ {
-  \   'read_temporary_file': 1,
-  \   'command': ale#Escape(g:ale_cpp_clangtidy_executable)
-  \     . ' -fix -fix-errors %t',
-  \ },
-  \ ale#fixers#clangtidy#Fix(bufnr(''))
diff --git a/test/fixers/test_eslint_fixer_callback.vader b/test/fixers/test_eslint_fixer_callback.vader
index 400267ac..50fc6672 100644
--- a/test/fixers/test_eslint_fixer_callback.vader
+++ b/test/fixers/test_eslint_fixer_callback.vader
@@ -1,7 +1,11 @@
 Before:
   call ale#assert#SetUpFixerTest('javascript', 'eslint')
+  Save g:ale_command_wrapper
+
   runtime autoload/ale/handlers/eslint.vim
 
+  let g:ale_command_wrapper = ''
+
 After:
   call ale#assert#TearDownFixerTest()
 
diff --git a/test/fixers/test_prettier_eslint_fixer.callback.vader b/test/fixers/test_prettier_eslint_fixer.callback.vader
index 90e11672..f7bb3c61 100644
--- a/test/fixers/test_prettier_eslint_fixer.callback.vader
+++ b/test/fixers/test_prettier_eslint_fixer.callback.vader
@@ -1,5 +1,8 @@
 Before:
   call ale#assert#SetUpFixerTest('javascript', 'prettier_eslint')
+  Save g:ale_command_wrapper
+
+  let g:ale_command_wrapper = ''
 
 After:
   call ale#assert#TearDownFixerTest()
diff --git a/test/fixers/test_prettier_fixer_callback.vader b/test/fixers/test_prettier_fixer_callback.vader
index 062ae8cf..1087a160 100644
--- a/test/fixers/test_prettier_fixer_callback.vader
+++ b/test/fixers/test_prettier_fixer_callback.vader
@@ -1,5 +1,8 @@
 Before:
   call ale#assert#SetUpFixerTest('javascript', 'prettier')
+  Save g:ale_command_wrapper
+
+  let g:ale_command_wrapper = ''
 
   silent cd ..
   silent cd command_callback
diff --git a/test/fixers/test_remark_lint_fixer_callback.vader b/test/fixers/test_remark_lint_fixer_callback.vader
new file mode 100644
index 00000000..5e2e342d
--- /dev/null
+++ b/test/fixers/test_remark_lint_fixer_callback.vader
@@ -0,0 +1,24 @@
+Before:
+  Save g:ale_markdown_remark_lint_executable
+  Save g:ale_markdown_remark_lint_options
+
+After:
+  Restore
+
+Execute(The remark callback should return the correct default values):
+  AssertEqual
+  \ {
+  \   'command': ale#Escape('remark')
+  \ },
+  \ ale#fixers#remark_lint#Fix(bufnr(''))
+
+Execute(The remark executable and options should be configurable):
+  let g:ale_markdown_remark_lint_executable = '/path/to/remark'
+  let g:ale_markdown_remark_lint_options = '-h'
+
+  AssertEqual
+  \ {
+  \   'command': ale#Escape('/path/to/remark')
+  \     . ' -h',
+  \ },
+  \ ale#fixers#remark_lint#Fix(bufnr(''))
diff --git a/test/fixers/test_standard_fixer_callback.vader b/test/fixers/test_standard_fixer_callback.vader
index db9f20f6..f5e9c487 100644
--- a/test/fixers/test_standard_fixer_callback.vader
+++ b/test/fixers/test_standard_fixer_callback.vader
@@ -15,7 +15,7 @@ Execute(The executable path should be correct):
   \   'read_temporary_file': 1,
   \   'command': (has('win32') ? 'node.exe ' : '')
   \     . ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/react-app/node_modules/standard/bin/cmd.js'))
-  \     . ' --fix %t',
+  \     . ' --fix --stdin < %s > %t',
   \ },
   \ ale#fixers#standard#Fix(bufnr(''))
 
@@ -26,6 +26,6 @@ Execute(Custom options should be supported):
   AssertEqual
   \ {
   \   'read_temporary_file': 1,
-  \   'command': ale#Escape('standard') . ' --foo-bar --fix %t',
+  \   'command': ale#Escape('standard') . ' --foo-bar --fix --stdin < %s > %t',
   \ },
   \ ale#fixers#standard#Fix(bufnr(''))