diff options
| author | Loïc Hoguin <[email protected]> | 2014-09-23 16:43:29 +0300 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2014-09-23 16:43:29 +0300 |
| commit | f1c3b6d76f0c97e1ab927c288bb94891ae4c253b (patch) | |
| tree | 5a14c007cdcb487032162b3ca96df648f521321a /test/http_SUITE.erl | |
| parent | b57f94661f5fd186f55eb0fead49849e0b1399d1 (diff) | |
| download | cowboy-f1c3b6d76f0c97e1ab927c288bb94891ae4c253b.tar.gz cowboy-f1c3b6d76f0c97e1ab927c288bb94891ae4c253b.tar.bz2 cowboy-f1c3b6d76f0c97e1ab927c288bb94891ae4c253b.zip | |
Breaking update of the cowboy_req interface
Simplify the interface for most cowboy_req functions. They all return
a single value except the four body reading functions. The reply functions
now only return a Req value.
Access functions do not return a Req anymore.
Functions that used to cache results do not have a cache anymore.
The interface for accessing query string and cookies has therefore
been changed.
There are now three query string functions: qs/1 provides access
to the raw query string value; parse_qs/1 returns the query string
as a list of key/values; match_qs/2 returns a map containing the
values requested in the second argument, after applying constraints
and default value.
Similarly, there are two cookie functions: parse_cookies/1 and
match_cookies/2. More match functions will be added in future commits.
None of the functions return an error tuple anymore. It either works
or crashes. Cowboy will attempt to provide an appropriate status code
in the response of crashed handlers.
As a result, the content decode function has its return value changed
to a simple binary, and the body reading functions only return on success.
Diffstat (limited to 'test/http_SUITE.erl')
| -rw-r--r-- | test/http_SUITE.erl | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl index 0417ad0..1bc13c1 100644 --- a/test/http_SUITE.erl +++ b/test/http_SUITE.erl @@ -592,13 +592,11 @@ onrequest_reply(Config) -> %% Hook for the above onrequest tests. do_onrequest_hook(Req) -> - case cowboy_req:qs_val(<<"reply">>, Req) of - {undefined, Req2} -> - cowboy_req:set_resp_header(<<"server">>, <<"Serenity">>, Req2); - {_, Req2} -> - {ok, Req3} = cowboy_req:reply( - 200, [], <<"replied!">>, Req2), - Req3 + case cowboy_req:match_qs(Req, [{reply, [], noreply}]) of + #{reply := noreply} -> + cowboy_req:set_resp_header(<<"server">>, <<"Serenity">>, Req); + _ -> + cowboy_req:reply(200, [], <<"replied!">>, Req) end. onresponse_capitalize(Config) -> @@ -612,8 +610,7 @@ onresponse_capitalize(Config) -> do_onresponse_capitalize_hook(Status, Headers, Body, Req) -> Headers2 = [{cowboy_bstr:capitalize_token(N), V} || {N, V} <- Headers], - {ok, Req2} = cowboy_req:reply(Status, Headers2, Body, Req), - Req2. + cowboy_req:reply(Status, Headers2, Body, Req). onresponse_crash(Config) -> ConnPid = gun_open(Config), @@ -630,9 +627,7 @@ onresponse_reply(Config) -> %% Hook for the above onresponse tests. do_onresponse_hook(_, Headers, _, Req) -> - {ok, Req2} = cowboy_req:reply( - <<"777 Lucky">>, [{<<"x-hook">>, <<"onresponse">>}|Headers], Req), - Req2. + cowboy_req:reply(<<"777 Lucky">>, [{<<"x-hook">>, <<"onresponse">>}|Headers], Req). parse_host(Config) -> ConnPid = gun_open(Config), |