                  ,@body))))
          (kill-buffer buff)))))
 
-(ycmd-ert-test-deferred-request get-completions "test.cpp" 'c++-mode
+(ycmd-ert-deftest-deferred-request get-completions "test.cpp" 'c++-mode
   :request-func 'ycmd-get-completions
   :line 8 :column 7
   (let ((start-col (assoc-default 'completion_start_column response))

                  completions))
    (should (= start-col 7))))

(ycmd-ert-test-deferred-request goto-declaration "test-goto.cpp" 'c++-mode
  :request-func (apply-partially #'ycmd--send-completer-command-request
                                 "GoToDeclaration")
  :line 9 :column 7

      (should (= (assoc-default 'line_num response) 5)))))

(defun ycmd-test-fixit-handler (buffer response file-name)
  (let ((ycmd-confirm-fixit nil)
        (fixits (assoc-default 'fixits response)))
    (when (and fixits (> (length fixits) 0))
      (with-current-buffer buffer
        (ycmd--handle-fixit-success response)
        (let ((actual (buffer-string))
