branch: externals/websocket commit ef1e504fecca9321213ea837bff53df1e39f2262 Author: Andrew Hyatt <ahy...@gmail.com> Commit: Andrew Hyatt <ahy...@gmail.com>
Fix tests broken by recent changes. In particular, commit 0591322dc9e311f73270279a51b0bbf8b47d4f9c and a5a3ddb5cad82f4259c07b7a49c95cdfe5fe6daa were both submitted without testing, which shouldn't happen. --- websocket-test.el | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/websocket-test.el b/websocket-test.el index cfb2db00fd..38119693f1 100644 --- a/websocket-test.el +++ b/websocket-test.el @@ -111,10 +111,10 @@ (ert-deftest websocket-verify-response-code () (should (websocket-verify-response-code "HTTP/1.1 101")) (should - (eq 400 (cdr (should-error (websocket-verify-response-code "HTTP/1.1 400") - :type 'websocket-received-error-http-response)))) + (equal '(400) (cdr (should-error (websocket-verify-response-code "HTTP/1.1 400") + :type 'websocket-received-error-http-response)))) (should - (eq 200 (cdr (should-error (websocket-verify-response-code "HTTP/1.1 200"))))) + (equal '(200) (cdr (should-error (websocket-verify-response-code "HTTP/1.1 200"))))) (should-error (websocket-verify-response-code "HTTP/1.") :type 'websocket-invalid-header)) @@ -445,10 +445,16 @@ (should (equal (list frame2 frame1) processed-frames)) (should-not (websocket-inflight-input fake-ws))) (flet ((websocket-close (websocket))) - (setf (websocket-ready-state fake-ws) 'connecting) - (should (eq 500 (cdr (should-error - (websocket-outer-filter fake-ws "HTTP/1.1 500\r\n\r\n") - :type 'websocket-received-error-http-response))))))) + (let ((on-error-called)) + (setf (websocket-ready-state fake-ws) 'connecting) + (setf (websocket-on-open fake-ws) (lambda (ws &rest _) t)) + (setf (websocket-on-error fake-ws) + (lambda (_ type err) + (should (eq type 'on-open)) + (should (equal '(websocket-received-error-http-response 500) err)) + (setq on-error-called t))) + (websocket-outer-filter fake-ws "HTTP/1.1 500\r\n\r\n") + (should on-error-called))))) (ert-deftest websocket-outer-filter-bad-connection () (let* ((on-open-calledp)