diff options
author | Loïc Hoguin <[email protected]> | 2018-05-17 17:53:16 +0200 |
---|---|---|
committer | Loïc Hoguin <[email protected]> | 2018-05-17 17:53:16 +0200 |
commit | fb5a261614652e83d5c2b3a7e8bb0561ebc9a331 (patch) | |
tree | 629b65c458c3f697d68e14c788f01be12cf9639d | |
parent | 0254c80c334b6fce03bb971d0323f97cdba20b13 (diff) | |
download | cowboy-fb5a261614652e83d5c2b3a7e8bb0561ebc9a331.tar.gz cowboy-fb5a261614652e83d5c2b3a7e8bb0561ebc9a331.tar.bz2 cowboy-fb5a261614652e83d5c2b3a7e8bb0561ebc9a331.zip |
Move a router test from old_http_SUITE to cowboy_router
-rw-r--r-- | src/cowboy_router.erl | 5 | ||||
-rw-r--r-- | test/old_http_SUITE.erl | 18 |
2 files changed, 7 insertions, 16 deletions
diff --git a/src/cowboy_router.erl b/src/cowboy_router.erl index 92ecf25..754e3e7 100644 --- a/src/cowboy_router.erl +++ b/src/cowboy_router.erl @@ -434,7 +434,10 @@ compile_test_() -> {[<<"hats">>, <<"page">>, number], [], h, o}]}]}, {[{"[...]ninenines.eu", [{"/hats/[...]", h, o}]}], [{[<<"eu">>, <<"ninenines">>, '...'], [], [ - {[<<"hats">>, '...'], [], h, o}]}]} + {[<<"hats">>, '...'], [], h, o}]}]}, + %% Path segment containing a colon. + {[{'_', [{"/foo/bar:blah", h, o}]}], [{'_', [], [ + {[<<"foo">>, <<"bar:blah">>], [], h, o}]}]} ], [{lists:flatten(io_lib:format("~p", [Rt])), fun() -> Rs = compile(Rt) end} || {Rt, Rs} <- Tests]. diff --git a/test/old_http_SUITE.erl b/test/old_http_SUITE.erl index b0cad72..5464702 100644 --- a/test/old_http_SUITE.erl +++ b/test/old_http_SUITE.erl @@ -35,13 +35,12 @@ all() -> {group, http_compress}, {group, https_compress}, {group, parse_host}, - {group, set_env}, - {group, router_compile} + {group, set_env} ]. groups() -> Tests = ct_helper:all(?MODULE) -- [ - parse_host, set_env_dispatch, path_allow_colon + parse_host, set_env_dispatch ], [ {http, [], Tests}, %% @todo parallel @@ -53,9 +52,6 @@ groups() -> ]}, {set_env, [], [ set_env_dispatch - ]}, - {router_compile, [], [ - path_allow_colon ]} ]. @@ -89,12 +85,8 @@ init_per_group(set_env, Config) -> env => #{dispatch => []} }), Port = ranch:get_port(set_env), - [{type, tcp}, {protocol, http}, {port, Port}, {opts, []}|Config]; -init_per_group(router_compile, Config) -> - Config. + [{type, tcp}, {protocol, http}, {port, Port}, {opts, []}|Config]. -end_per_group(router_compile, _) -> - ok; end_per_group(Name, _) -> ok = cowboy:stop_listener(Name). @@ -573,10 +565,6 @@ set_env_dispatch(Config) -> {response, nofin, 200, _} = gun:await(ConnPid2, Ref2), ok. -path_allow_colon(_Config) -> - cowboy_router:compile([{'_', [{"/foo/bar:blah", http_handler, []}]}]), - ok. - set_resp_overwrite(Config) -> ConnPid = gun_open(Config), Ref = gun:get(ConnPid, "/set_resp/overwrite"), |