From ded1bc14df6ddacd373cf9fe635f8489b9fb4f69 Mon Sep 17 00:00:00 2001
From: w0rp <devw0rp@gmail.com>
Date: Wed, 26 Jul 2017 23:17:46 +0100
Subject: #810 Ignore output which isn't JSON for brakeman

---
 ale_linters/ruby/brakeman.vim            |  7 ++++++-
 test/handler/test_brakeman_handler.vader | 24 +++++++++++++-----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/ale_linters/ruby/brakeman.vim b/ale_linters/ruby/brakeman.vim
index 269c18f0..565c8c70 100644
--- a/ale_linters/ruby/brakeman.vim
+++ b/ale_linters/ruby/brakeman.vim
@@ -9,7 +9,12 @@ function! ale_linters#ruby#brakeman#Handle(buffer, lines) abort
         return []
     endif
 
-    let l:result = json_decode(join(a:lines, ''))
+    try
+        let l:result = json_decode(join(a:lines, ''))
+    catch /E474/
+        " Ignore invalid JSON
+        return []
+    endtry
 
     let l:output = []
 
diff --git a/test/handler/test_brakeman_handler.vader b/test/handler/test_brakeman_handler.vader
index 240a0990..02d70234 100644
--- a/test/handler/test_brakeman_handler.vader
+++ b/test/handler/test_brakeman_handler.vader
@@ -1,20 +1,15 @@
 Before:
-    " Switch to the test rails directory.
-    let b:path = getcwd()
-    silent! cd /testplugin/test/handler
-    cd ../ruby_fixtures/valid_rails_app/app/models
+  call ale#test#SetDirectory('/testplugin/test/handler')
+  cd ..
 
-    runtime ale_linters/ruby/brakeman.vim
+  runtime ale_linters/ruby/brakeman.vim
 
 After:
-    " Switch back to whatever directory it was that we started on.
-    silent! 'cd ' . fnameescape(b:path)
-    unlet! b:path
-
-    call ale#linter#Reset()
+  call ale#test#RestoreDirectory()
+  call ale#linter#Reset()
 
 Execute(The brakeman handler should parse JSON correctly):
-  silent file! thing.rb
+  call ale#test#SetFilename('ruby_fixtures/valid_rails_app/app/models/thing.rb')
 
   AssertEqual
   \  [
@@ -78,3 +73,10 @@ Execute(The brakeman handler should parse JSON correctly when there is no output
   \ [],
   \ ale_linters#ruby#brakeman#Handle(347, [
   \ ])
+  \
+Execute(The brakeman handler should handle garbage output):
+  AssertEqual
+  \ [],
+  \ ale_linters#ruby#brakeman#Handle(347, [
+  \   'No such command in 2.4.1 of ruby',
+  \ ])
-- 
cgit v1.2.3