Ensuring /event_notification always returns JSON

Empty string is not valid JSON. Fixes ycm-core#51.
Grimy · Nov 18, 2014 · 67c2e3c · 67c2e3c
1 parent 36167a0
commit 67c2e3c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/ycmd/handlers.py b/ycmd/handlers.py
@@ -71,6 +71,7 @@ def EventNotification():
 
   if response_data:
     return _JsonResponse( response_data )
+  return _JsonResponse( {} )
 
 
 @app.post( '/run_completer_command' )

diff --git a/ycmd/tests/diagnostics_test.py b/ycmd/tests/diagnostics_test.py
@@ -134,8 +134,8 @@ def Diagnostics_ClangCompleter_PragmaOnceWarningIgnored_test():
                              filepath = '/foo.h',
                              filetype = 'cpp' )
 
-  response = app.post_json( '/event_notification', event_data )
-  assert_that( response.body, empty() )
+  response = app.post_json( '/event_notification', event_data ).json
+  assert_that( response, empty() )
 
 
 @with_setup( Setup )

diff --git a/ycmd/tests/misc_handlers_test.py b/ycmd/tests/misc_handlers_test.py
@@ -47,3 +47,12 @@ def UserOptions_Works_test():
   app.post_json( '/user_options', options )
   eq_( options, app.get( '/user_options' ).json )
 
+
+
+@with_setup( Setup )
+def EventNotification_AlwaysJsonResponse_test():
+  app = TestApp( handlers.app )
+  event_data = BuildRequest( contents = 'foo foogoo ba',
+                             event_name = 'FileReadyToParse' )
+
+  app.post_json( '/event_notification', event_data ).json