aboutsummaryrefslogtreecommitdiffstats
path: root/test/handlers
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2019-10-06 16:51:27 +0200
committerLoïc Hoguin <[email protected]>2019-10-06 16:51:27 +0200
commit3977f2b96fb8cc2164bfe28ee094b3e661a2fad9 (patch)
treeb709721f8f69a4ee87bbfab8359915bfd201bb10 /test/handlers
parent2b3852635115ad0aeeade9aeb88f285cfcd870b1 (diff)
downloadcowboy-3977f2b96fb8cc2164bfe28ee094b3e661a2fad9.tar.gz
cowboy-3977f2b96fb8cc2164bfe28ee094b3e661a2fad9.tar.bz2
cowboy-3977f2b96fb8cc2164bfe28ee094b3e661a2fad9.zip
Document the commands based Websocket interface
The old interface with ok|reply|stop tuples is deprecated.
Diffstat (limited to 'test/handlers')
-rw-r--r--test/handlers/ws_deflate_opts_h.erl8
-rw-r--r--test/handlers/ws_dont_validate_utf8_h.erl8
-rw-r--r--test/handlers/ws_init_h.erl26
3 files changed, 20 insertions, 22 deletions
diff --git a/test/handlers/ws_deflate_opts_h.erl b/test/handlers/ws_deflate_opts_h.erl
index 1c15efe..b70110b 100644
--- a/test/handlers/ws_deflate_opts_h.erl
+++ b/test/handlers/ws_deflate_opts_h.erl
@@ -26,11 +26,11 @@ init(Req=#{qs := Qs}, State) ->
}}.
websocket_handle({text, Data}, State) ->
- {reply, {text, Data}, State};
+ {[{text, Data}], State};
websocket_handle({binary, Data}, State) ->
- {reply, {binary, Data}, State};
+ {[{binary, Data}], State};
websocket_handle(_, State) ->
- {ok, State}.
+ {[], State}.
websocket_info(_, State) ->
- {ok, State}.
+ {[], State}.
diff --git a/test/handlers/ws_dont_validate_utf8_h.erl b/test/handlers/ws_dont_validate_utf8_h.erl
index 6599c78..27be6ad 100644
--- a/test/handlers/ws_dont_validate_utf8_h.erl
+++ b/test/handlers/ws_dont_validate_utf8_h.erl
@@ -13,11 +13,11 @@ init(Req, State) ->
}}.
websocket_handle({text, Data}, State) ->
- {reply, {text, Data}, State};
+ {[{text, Data}], State};
websocket_handle({binary, Data}, State) ->
- {reply, {binary, Data}, State};
+ {[{binary, Data}], State};
websocket_handle(_, State) ->
- {ok, State}.
+ {[], State}.
websocket_info(_, State) ->
- {ok, State}.
+ {[], State}.
diff --git a/test/handlers/ws_init_h.erl b/test/handlers/ws_init_h.erl
index 08971ae..db5307b 100644
--- a/test/handlers/ws_init_h.erl
+++ b/test/handlers/ws_init_h.erl
@@ -18,30 +18,28 @@ websocket_init(State) ->
do_websocket_init(State).
do_websocket_init(State=ok) ->
- {ok, State};
+ {[], State};
do_websocket_init(State=ok_hibernate) ->
- {ok, State, hibernate};
+ {[], State, hibernate};
do_websocket_init(State=reply) ->
- {reply, {text, "Hello"}, State};
+ {[{text, "Hello"}], State};
do_websocket_init(State=reply_hibernate) ->
- {reply, {text, "Hello"}, State, hibernate};
+ {[{text, "Hello"}], State, hibernate};
do_websocket_init(State=reply_close) ->
- {reply, close, State};
+ {[close], State};
do_websocket_init(State=reply_close_hibernate) ->
- {reply, close, State, hibernate};
+ {[close], State, hibernate};
do_websocket_init(State=reply_many) ->
- {reply, [{text, "Hello"}, {binary, "World"}], State};
+ {[{text, "Hello"}, {binary, "World"}], State};
do_websocket_init(State=reply_many_hibernate) ->
- {reply, [{text, "Hello"}, {binary, "World"}], State, hibernate};
+ {[{text, "Hello"}, {binary, "World"}], State, hibernate};
do_websocket_init(State=reply_many_close) ->
- {reply, [{text, "Hello"}, close], State};
+ {[{text, "Hello"}, close], State};
do_websocket_init(State=reply_many_close_hibernate) ->
- {reply, [{text, "Hello"}, close], State, hibernate};
-do_websocket_init(State=stop) ->
- {stop, State}.
+ {[{text, "Hello"}, close], State, hibernate}.
websocket_handle(_, State) ->
- {ok, State}.
+ {[], State}.
websocket_info(_, State) ->
- {ok, State}.
+ {[], State}.