1 files changed, 6 insertions, 19 deletions
diff --git a/test/fixers/test_yamlfix_fixer_callback.vader b/test/fixers/test_yamlfix_fixer_callback.vader
index 3ffda91e..75b9f0ad 100644
--- a/test/fixers/test_yamlfix_fixer_callback.vader
+++ b/test/fixers/test_yamlfix_fixer_callback.vader
@@ -1,12 +1,6 @@
 Before:
-  Save g:ale_python_yamlfix_executable
-  Save g:ale_python_yamlfix_options
+  call ale#assert#SetUpFixerTest('yaml', 'yamlfix')
 
-  " Use an invalid global executable, so we don't match it.
-  let g:ale_python_yamlfix_executable = 'xxxinvalid'
-  let g:ale_python_yamlfix_options = ''
-
-  call ale#test#SetDirectory('/testplugin/test/fixers')
   silent cd ..
   silent cd command_callback
   let g:dir = getcwd()
@@ -14,11 +8,8 @@ Before:
   let b:bin_dir = has('win32') ? 'Scripts' : 'bin'
 
 After:
-  Restore
-
   unlet! b:bin_dir
-
-  call ale#test#RestoreDirectory()
+  call ale#assert#TearDownFixerTest()
 
 Execute(The yamlfix callback should return the correct default values):
   AssertEqual
@@ -28,23 +19,19 @@ Execute(The yamlfix callback should return the correct default values):
   silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.yaml')
   AssertEqual
   \ {
-  \   'command': ale#path#BufferCdString(bufnr(''))
-  \     . ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/yamlfix')) . ' -',
+  \   'cwd': '%s:h',
+  \   'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/yamlfix')) . ' -',
   \ },
   \ ale#fixers#yamlfix#Fix(bufnr(''))
 
 Execute(The yamlfix callback should respect custom options):
   let g:ale_yaml_yamlfix_options = '--multi-line=3 --trailing-comma'
 
-  AssertEqual
-  \ 0,
-  \ ale#fixers#yamlfix#Fix(bufnr(''))
-
   silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.yaml')
   AssertEqual
   \ {
-  \   'command': ale#path#BufferCdString(bufnr(''))
-  \     . ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/yamlfix'))
+  \   'cwd': '%s:h',
+  \   'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/yamlfix'))
   \     . ' --multi-line=3 --trailing-comma -',
   \ },
   \ ale#fixers#yamlfix#Fix(bufnr(''))