aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2017-01-04 19:45:35 +0100
committerLoïc Hoguin <[email protected]>2017-01-04 19:45:35 +0100
commite5a8088e68f29206e162ee0f25f45a55ce05fe04 (patch)
tree19004292e7e37726a68f57dd0f50db7e5bb47553
parentf34ef2ceae4bccd49f3a655e311c310b7570e64f (diff)
downloadcowboy-e5a8088e68f29206e162ee0f25f45a55ce05fe04.tar.gz
cowboy-e5a8088e68f29206e162ee0f25f45a55ce05fe04.tar.bz2
cowboy-e5a8088e68f29206e162ee0f25f45a55ce05fe04.zip
Make the new cowboy_req tests more realistic2.0.0-pre.5
-rw-r--r--src/cowboy_req.erl1
-rw-r--r--test/handlers/resp_h.erl44
-rw-r--r--test/req_SUITE.erl4
3 files changed, 27 insertions, 22 deletions
diff --git a/src/cowboy_req.erl b/src/cowboy_req.erl
index c2a85e5..ac9054b 100644
--- a/src/cowboy_req.erl
+++ b/src/cowboy_req.erl
@@ -580,7 +580,6 @@ set_resp_headers(Headers, Req=#{resp_headers := RespHeaders}) ->
set_resp_headers(Headers, Req) ->
Req#{resp_headers => Headers}.
-
-spec resp_header(binary(), req()) -> binary() | undefined.
resp_header(Name, Req) ->
resp_header(Name, Req, undefined).
diff --git a/test/handlers/resp_h.erl b/test/handlers/resp_h.erl
index 97423c0..658c5f8 100644
--- a/test/handlers/resp_h.erl
+++ b/test/handlers/resp_h.erl
@@ -26,28 +26,34 @@ do(<<"set_resp_header">>, Req0, Opts) ->
Req = cowboy_req:set_resp_header(<<"content-type">>, <<"text/plain">>, Req0),
{ok, cowboy_req:reply(200, #{}, "OK", Req), Opts};
do(<<"set_resp_headers">>, Req0, Opts) ->
- Req = cowboy_req:set_resp_headers(#{<<"x-header-test1">> => <<"test1">>, <<"x-header-test2">> => <<"test2">>}, Req0),
+ Req = cowboy_req:set_resp_headers(#{
+ <<"content-type">> => <<"text/plain">>,
+ <<"content-encoding">> => <<"gzip">>
+ }, Req0),
{ok, cowboy_req:reply(200, #{}, "OK", Req), Opts};
-do(<<"resp_headers">>, Req0, Opts) ->
- Req1 = cowboy_req:set_resp_header(<<"x-header-test1">>, <<"test1">>, Req0),
- Req2 = cowboy_req:set_resp_headers(#{<<"x-header-test2">> => <<"test2">>, <<"x-header-test3">> => <<"test3">>}, Req1),
- Headers = cowboy_req:resp_headers(Req2),
- true = maps:is_key(<<"x-header-test1">>, Headers),
- true = maps:is_key(<<"x-header-test2">>, Headers),
- true = maps:is_key(<<"x-header-test3">>, Headers),
- {ok, cowboy_req:reply(200, #{}, "OK", Req2), Opts};
do(<<"resp_header_defined">>, Req0, Opts) ->
- Req1 = cowboy_req:set_resp_header(<<"x-header-test1">>, <<"test1">>, Req0),
- <<"test1">> = cowboy_req:resp_header(<<"x-header-test1">>, Req1),
- <<"test1">> = cowboy_req:resp_header(<<"x-header-test1">>, Req1, foo),
- {ok, cowboy_req:reply(200, #{}, "OK", Req0), Opts};
-do(<<"resp_header_default">>, Req0, Opts) ->
- undefined = cowboy_req:resp_header(<<"x-header-test1">>, Req0),
- <<"ok">> = cowboy_req:resp_header(<<"x-header-test1">>, Req0, <<"ok">>),
- {ok, cowboy_req:reply(200, #{}, "OK", Req0), Opts};
-do(<<"resp_headers_empty">>, Req0, Opts) ->
- #{} = cowboy_req:resp_headers(Req0),
+ Req1 = cowboy_req:set_resp_header(<<"content-type">>, <<"text/plain">>, Req0),
+ <<"text/plain">> = cowboy_req:resp_header(<<"content-type">>, Req1),
+ <<"text/plain">> = cowboy_req:resp_header(<<"content-type">>, Req1, default),
{ok, cowboy_req:reply(200, #{}, "OK", Req0), Opts};
+do(<<"resp_header_default">>, Req, Opts) ->
+ undefined = cowboy_req:resp_header(<<"content-type">>, Req),
+ default = cowboy_req:resp_header(<<"content-type">>, Req, default),
+ {ok, cowboy_req:reply(200, #{}, "OK", Req), Opts};
+do(<<"resp_headers">>, Req0, Opts) ->
+ Req1 = cowboy_req:set_resp_header(<<"server">>, <<"nginx">>, Req0),
+ Req = cowboy_req:set_resp_headers(#{
+ <<"content-type">> => <<"text/plain">>,
+ <<"content-encoding">> => <<"gzip">>
+ }, Req1),
+ Headers = cowboy_req:resp_headers(Req),
+ true = maps:is_key(<<"server">>, Headers),
+ true = maps:is_key(<<"content-type">>, Headers),
+ true = maps:is_key(<<"content-encoding">>, Headers),
+ {ok, cowboy_req:reply(200, #{}, "OK", Req), Opts};
+do(<<"resp_headers_empty">>, Req, Opts) ->
+ #{} = cowboy_req:resp_headers(Req),
+ {ok, cowboy_req:reply(200, #{}, "OK", Req), Opts};
do(<<"set_resp_body">>, Req0, Opts) ->
Arg = cowboy_req:binding(arg, Req0),
Req1 = case Arg of
diff --git a/test/req_SUITE.erl b/test/req_SUITE.erl
index 809e9f0..769daf3 100644
--- a/test/req_SUITE.erl
+++ b/test/req_SUITE.erl
@@ -490,8 +490,8 @@ set_resp_header(Config) ->
set_resp_headers(Config) ->
doc("Response using set_resp_headers."),
{200, Headers, <<"OK">>} = do_get("/resp/set_resp_headers", Config),
- true = lists:keymember(<<"x-header-test1">>, 1, Headers),
- true = lists:keymember(<<"x-header-test2">>, 1, Headers),
+ true = lists:keymember(<<"content-type">>, 1, Headers),
+ true = lists:keymember(<<"content-encoding">>, 1, Headers),
ok.
resp_header(Config) ->