1 files changed, 15 insertions, 14 deletions
diff --git a/test/command_callback/test_erubi_command_callback.vader b/test/command_callback/test_erubi_command_callback.vader
index 1953d763..0643efc2 100644
--- a/test/command_callback/test_erubi_command_callback.vader
+++ b/test/command_callback/test_erubi_command_callback.vader
@@ -1,31 +1,32 @@
 Before:
-  runtime ale_linters/eruby/erubi.vim
-  call ale#test#SetDirectory('/testplugin/test/command_callback')
+  call ale#assert#SetUpLinterTest('eruby', 'erubi')
 
 After:
-  call ale#linter#Reset()
-  call ale#test#RestoreDirectory()
+  call ale#assert#TearDownLinterTest()
 
 Execute(Executable should not contain any filter code by default):
   call ale#test#SetFilename('../ruby_fixtures/not_a_rails_app/file.rb')
 
-  AssertEqual
+  AssertLinter 'ruby', [
+  \ 'ruby -r erubi/capture_end -e ' . ale#Escape('""'),
   \ 'ruby -r erubi/capture_end -e ' . ale#Escape('puts Erubi::CaptureEndEngine.new($stdin.read).src') . '< %t | ruby -c',
-  \ ale_linters#eruby#erubi#GetCommand(bufnr(''), [])
+  \]
 
 Execute(Executable should filter invalid eRuby when inside a Rails project):
   call ale#test#SetFilename('../ruby_fixtures/valid_rails_app/app/views/my_great_view.html.erb')
 
-  AssertEqual
+  AssertLinter 'ruby', [
+  \ 'ruby -r erubi/capture_end -e ' . ale#Escape('""'),
   \ 'ruby -r erubi/capture_end -e ' . ale#Escape('puts Erubi::CaptureEndEngine.new($stdin.read.gsub(%{<%=},%{<%}), nil, %{-}).src') . '< %t | ruby -c',
-  \ ale_linters#eruby#erubi#GetCommand(bufnr(''), [])
+  \]
 
-Execute(Command should be blank if the first command in the chain return output):
-  let output_lines = [
-  \    "/usr/lib/ruby/2.3.0/rubygems/core_ext/kernel_require.rb:55:in `require': cannot load such file -- erubi/capture_end (LoadError)",
-  \    "        from /usr/lib/ruby/2.3.0/rubygems/core_ext/kernel_require.rb:55:in `require'",
+Execute(Command should be blank if the first command in the chain returns output):
+  WithChainResults [
+  \ "/usr/lib/ruby/2.3.0/rubygems/core_ext/kernel_require.rb:55:in `require': cannot load such file -- erubi/capture_end (LoadError)",
+  \ "        from /usr/lib/ruby/2.3.0/rubygems/core_ext/kernel_require.rb:55:in `require'",
   \]
 
-  AssertEqual
+  AssertLinter 'ruby', [
+  \ 'ruby -r erubi/capture_end -e ' . ale#Escape('""'),
   \ '',
-  \ ale_linters#eruby#erubi#GetCommand(bufnr(''), output_lines)
+  \]