From a357c49d1bdbc524a9cdf1f11b9aed66cac47f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 28 Jan 2013 16:53:09 +0100 Subject: New routing Ultimately few things change, it's mostly just a nicer syntax and slightly different expectations. The name of the value `dispatch` did not change, because the previous dispatch values will now fail if the code is not updated to using `cowboy_router:compile/1`. No constraints have been implemented in this commit. --- test/ws_SUITE.erl | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'test/ws_SUITE.erl') diff --git a/test/ws_SUITE.erl b/test/ws_SUITE.erl index 61bb236..06d4b3e 100644 --- a/test/ws_SUITE.erl +++ b/test/ws_SUITE.erl @@ -88,35 +88,35 @@ end_per_group(Listener, _Config) -> %% Dispatch configuration. init_dispatch() -> - [ - {[<<"localhost">>], [ - {[<<"websocket">>], websocket_handler, []}, - {[<<"ws_echo_handler">>], websocket_echo_handler, []}, - {[<<"ws_init_shutdown">>], websocket_handler_init_shutdown, []}, - {[<<"ws_send_many">>], ws_send_many_handler, [ + cowboy_router:compile([ + {"localhost", [ + {"/websocket", websocket_handler, []}, + {"/ws_echo_handler", websocket_echo_handler, []}, + {"/ws_init_shutdown", websocket_handler_init_shutdown, []}, + {"/ws_send_many", ws_send_many_handler, [ {sequence, [ {text, <<"one">>}, {text, <<"two">>}, {text, <<"seven!">>}]} ]}, - {[<<"ws_send_close">>], ws_send_many_handler, [ + {"/ws_send_close", ws_send_many_handler, [ {sequence, [ {text, <<"send">>}, close, {text, <<"won't be received">>}]} ]}, - {[<<"ws_send_close_payload">>], ws_send_many_handler, [ + {"/ws_send_close_payload", ws_send_many_handler, [ {sequence, [ {text, <<"send">>}, {close, 1001, <<"some text!">>}, {text, <<"won't be received">>}]} ]}, - {[<<"ws_timeout_hibernate">>], ws_timeout_hibernate_handler, []}, - {[<<"ws_timeout_cancel">>], ws_timeout_cancel_handler, []}, - {[<<"ws_upgrade_with_opts">>], ws_upgrade_with_opts_handler, + {"/ws_timeout_hibernate", ws_timeout_hibernate_handler, []}, + {"/ws_timeout_cancel", ws_timeout_cancel_handler, []}, + {"/ws_upgrade_with_opts", ws_upgrade_with_opts_handler, <<"failure">>} ]} - ]. + ]). %% ws and wss. -- cgit v1.2.3