3 files changed, 59 insertions, 4 deletions
diff --git a/test/fixers/test_eslint_fixer_callback.vader b/test/fixers/test_eslint_fixer_callback.vader
index afb267a2..aafc4e71 100644
--- a/test/fixers/test_eslint_fixer_callback.vader
+++ b/test/fixers/test_eslint_fixer_callback.vader
@@ -101,6 +101,7 @@ Execute(--fix-to-stdout should be used for eslint_d):
   \   'command':
   \     ale#Escape(ale#path#Winify(g:dir . '/../eslint-test-files/app-with-eslint-d/node_modules/.bin/eslint_d'))
   \     . ' --stdin-filename %s --stdin --fix-to-stdout',
+  \   'process_with': 'ale#fixers#eslint#ProcessEslintDOutput',
   \ },
   \ ale#fixers#eslint#ApplyFixForVersion(bufnr(''), ['v3.19.0 (eslint_d v4.2.0)'])
 
@@ -110,6 +111,7 @@ Execute(--fix-to-stdout should be used for eslint_d):
   \   'command':
   \     ale#Escape(ale#path#Winify(g:dir . '/../eslint-test-files/app-with-eslint-d/node_modules/.bin/eslint_d'))
   \     . ' --stdin-filename %s --stdin --fix-to-stdout',
+  \   'process_with': 'ale#fixers#eslint#ProcessEslintDOutput',
   \ },
   \ ale#fixers#eslint#ApplyFixForVersion(bufnr(''), ['4.9.0'])
 
@@ -150,3 +152,21 @@ Execute(The --fix-dry-run post-processor should handle JSON output correctly):
   AssertEqual
   \ ['foo', 'bar'],
   \ ale#fixers#eslint#ProcessFixDryRunOutput(bufnr(''), ['[{"output": "foo\nbar"}]'])
+
+Execute(The eslint_d post-processor should permit regular JavaScript content):
+  AssertEqual
+  \ [
+  \   'const x = ''Error: foo''',
+  \   'const y = 3',
+  \ ],
+  \ ale#fixers#eslint#ProcessEslintDOutput(bufnr(''), [
+  \   'const x = ''Error: foo''',
+  \   'const y = 3',
+  \ ])
+
+Execute(The eslint_d post-processor should handle error messages correctly):
+  AssertEqual
+  \ [],
+  \ ale#fixers#eslint#ProcessEslintDOutput(bufnr(''), [
+  \   'Error: No ESLint configuration found.',
+  \ ])
diff --git a/test/fixers/test_importjs_fixer_callback.vader b/test/fixers/test_importjs_fixer_callback.vader
new file mode 100644
index 00000000..c3e57f8b
--- /dev/null
+++ b/test/fixers/test_importjs_fixer_callback.vader
@@ -0,0 +1,35 @@
+Before:
+  Save g:ale_js_importjs_executable
+
+  " Use an invalid global executable, so we don't match it.
+  let g:ale_js_importjs_executable = 'xxxinvalid'
+
+  call ale#test#SetDirectory('/testplugin/test/fixers')
+  call ale#test#SetFilename('../javascript_files/test.js')
+
+After:
+  Restore
+
+  call ale#test#RestoreDirectory()
+
+Execute(The importjs callback should return 0 when the executable isn't executable):
+  AssertEqual
+  \ 0,
+  \ ale#fixers#importjs#Fix(bufnr(''))
+
+Execute(The importjs callback should run the command when the executable test passes):
+  let g:ale_js_importjs_executable = has('win32') ? 'cmd' : 'echo'
+
+  AssertEqual
+  \ {
+  \   'process_with': 'ale#fixers#importjs#ProcessOutput',
+  \   'command': ale#Escape(g:ale_js_importjs_executable) . ' fix %s'
+  \ },
+  \ ale#fixers#importjs#Fix(bufnr(''))
+
+Execute(The ProcessOutput callback should return the expected output):
+  let g:testOutput = '{"messages":[],"fileContent":"one\ntwo","unresolvedImports":{}}'
+
+  AssertEqual
+  \ ['one', 'two'],
+  \ ale#fixers#importjs#ProcessOutput(bufnr(''), g:testOutput)
diff --git a/test/fixers/test_phpcbf_fixer_callback.vader b/test/fixers/test_phpcbf_fixer_callback.vader
index cf02a0b5..b5c72f21 100644
--- a/test/fixers/test_phpcbf_fixer_callback.vader
+++ b/test/fixers/test_phpcbf_fixer_callback.vader
@@ -43,7 +43,7 @@ Execute(The phpcbf callback should return the correct default values):
   call ale#test#SetFilename('php_paths/project-with-phpcbf/foo/test.php')
 
   AssertEqual
-  \ {'command': ale#Escape(ale#path#Winify(g:dir . '/php_paths/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s ' },
+  \ {'command': ale#Escape(ale#path#Winify(g:dir . '/php_paths/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s  -' },
   \ ale#fixers#phpcbf#Fix(bufnr(''))
 
 Execute(The phpcbf callback should include the phpcbf_standard option):
@@ -51,7 +51,7 @@ Execute(The phpcbf callback should include the phpcbf_standard option):
   call ale#test#SetFilename('php_paths/project-with-phpcbf/foo/test.php')
 
   AssertEqual
-  \ {'command': ale#Escape(ale#path#Winify(g:dir . '/php_paths/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s ' . '--standard=phpcbf_ruleset.xml'},
+  \ {'command': ale#Escape(ale#path#Winify(g:dir . '/php_paths/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s ' . '--standard=phpcbf_ruleset.xml' . ' -'},
   \ ale#fixers#phpcbf#Fix(bufnr(''))
 
 Before:
@@ -99,7 +99,7 @@ Execute(The phpcbf callback should return the correct default values):
   call ale#test#SetFilename('php_paths/project-with-phpcbf/foo/test.php')
 
   AssertEqual
-  \ {'command': ale#Escape(ale#path#Winify(g:dir . '/php_paths/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s ' },
+  \ {'command': ale#Escape(ale#path#Winify(g:dir . '/php_paths/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s  -' },
   \ ale#fixers#phpcbf#Fix(bufnr(''))
 
 Execute(The phpcbf callback should include the phpcbf_standard option):
@@ -107,6 +107,6 @@ Execute(The phpcbf callback should include the phpcbf_standard option):
   call ale#test#SetFilename('php_paths/project-with-phpcbf/foo/test.php')
 
   AssertEqual
-  \ {'command': ale#Escape(ale#path#Winify(g:dir . '/php_paths/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s ' . '--standard=phpcbf_ruleset.xml'},
+  \ {'command': ale#Escape(ale#path#Winify(g:dir . '/php_paths/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s ' . '--standard=phpcbf_ruleset.xml' . ' -'},
   \ ale#fixers#phpcbf#Fix(bufnr(''))