From 5964273cc4354b7378b8bdf49fe455d2b46d7c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 26 Mar 2018 18:49:09 +0200 Subject: Fix the flushing of messages when switching to Websocket We now flush messages that are specific to cowboy_http only. Stream handlers should also flush their own specific messages if necessary, although timeouts will be flushed regardless of where they originate from. Also renames the http_SUITE to old_http_SUITE to distinguish new tests from old tests. Most old tests need to be removed or converted eventually as they're legacy tests from Cowboy 1.0. --- test/old_http_SUITE_data/http_set_resp.erl | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 test/old_http_SUITE_data/http_set_resp.erl (limited to 'test/old_http_SUITE_data/http_set_resp.erl') diff --git a/test/old_http_SUITE_data/http_set_resp.erl b/test/old_http_SUITE_data/http_set_resp.erl new file mode 100644 index 0000000..e575aab --- /dev/null +++ b/test/old_http_SUITE_data/http_set_resp.erl @@ -0,0 +1,25 @@ +%% Feel free to use, reuse and abuse the code in this file. + +-module(http_set_resp). + +-export([init/2]). + +init(Req, Opts) -> + Headers = proplists:get_value(headers, Opts, #{}), + Body = proplists:get_value(body, Opts, <<"http_handler_set_resp">>), + Req2 = lists:foldl(fun({Name, Value}, R) -> + cowboy_req:set_resp_header(Name, Value, R) + end, Req, maps:to_list(Headers)), + Req3 = cowboy_req:set_resp_body(Body, Req2), + Req4 = cowboy_req:set_resp_header(<<"x-cowboy-test">>, <<"ok">>, Req3), + Req5 = cowboy_req:set_resp_cookie(<<"cake">>, <<"lie">>, Req4), + case cowboy_req:has_resp_header(<<"x-cowboy-test">>, Req5) of + false -> {ok, Req5, Opts}; + true -> + case cowboy_req:has_resp_body(Req5) of + false -> + {ok, Req5, Opts}; + true -> + {ok, cowboy_req:reply(200, Req5), Opts} + end + end. -- cgit v1.2.3