Pop highlight query params.

notesapi/v1/tests/test_views.py

@@ -337,7 +337,7 @@ class AnnotationViewTests(BaseAnnotationViewTests):
         results = self._get_search_results()
         self.assertEqual(results['total'], 2)
 
-        results = self._get_search_results(text="first", highlight=True)
+        results = self._get_search_results(text="first", highlight=True, highlight_class='class', highlight_tag='tag')
         self.assertEqual(results['total'], 1)
         self.assertEqual(len(results['rows']), 1)
         self.assertEqual(results['rows'][0]['text'], '<span>First</span> note')

notesapi/v1/views.py

@@ -28,7 +28,11 @@ class AnnotationSearchView(APIView):
                 params[field + "__match"] = params[field]
                 del params[field]
         if params.get('highlight'):
-            params.pop('highlight')
+
+            # Currently we do not use highlight_class and highlight_tag in service.
+            for param in ['highlight', 'highlight_class', 'highlight_tag']:
+                params.pop(param, None)
+
             results = NoteMappingType.process_result(
                 list(
                     note_searcher.query(**params).order_by("-created").values_dict("_source") \