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/http_SUITE_data/rest_forbidden_resource.erl | 32 ------------------------ 1 file changed, 32 deletions(-) delete mode 100644 test/http_SUITE_data/rest_forbidden_resource.erl (limited to 'test/http_SUITE_data/rest_forbidden_resource.erl') diff --git a/test/http_SUITE_data/rest_forbidden_resource.erl b/test/http_SUITE_data/rest_forbidden_resource.erl deleted file mode 100644 index 0a65228..0000000 --- a/test/http_SUITE_data/rest_forbidden_resource.erl +++ /dev/null @@ -1,32 +0,0 @@ --module(rest_forbidden_resource). - --export([init/2]). --export([allowed_methods/2]). --export([forbidden/2]). --export([content_types_provided/2]). --export([content_types_accepted/2]). --export([to_text/2]). --export([from_text/2]). - -init(Req, [Forbidden]) -> - {cowboy_rest, Req, Forbidden}. - -allowed_methods(Req, State) -> - {[<<"GET">>, <<"HEAD">>, <<"POST">>], Req, State}. - -forbidden(Req, State=true) -> - {true, Req, State}; -forbidden(Req, State=false) -> - {false, Req, State}. - -content_types_provided(Req, State) -> - {[{{<<"text">>, <<"plain">>, []}, to_text}], Req, State}. - -content_types_accepted(Req, State) -> - {[{{<<"text">>, <<"plain">>, []}, from_text}], Req, State}. - -to_text(Req, State) -> - {<<"This is REST!">>, Req, State}. - -from_text(Req, State) -> - {{true, cowboy_req:path(Req)}, Req, State}. -- cgit v1.2.3