aboutsummaryrefslogtreecommitdiffstats
path: root/test/ws_SUITE_data
diff options
context:
space:
mode:
Diffstat (limited to 'test/ws_SUITE_data')
-rw-r--r--test/ws_SUITE_data/ws_echo.erl2
-rw-r--r--test/ws_SUITE_data/ws_echo_timer.erl2
-rw-r--r--test/ws_SUITE_data/ws_init_shutdown.erl4
-rw-r--r--test/ws_SUITE_data/ws_send_many.erl2
-rw-r--r--test/ws_SUITE_data/ws_timeout_cancel.erl2
-rw-r--r--test/ws_SUITE_data/ws_timeout_hibernate.erl2
6 files changed, 7 insertions, 7 deletions
diff --git a/test/ws_SUITE_data/ws_echo.erl b/test/ws_SUITE_data/ws_echo.erl
index c4ab406..89ebcb6 100644
--- a/test/ws_SUITE_data/ws_echo.erl
+++ b/test/ws_SUITE_data/ws_echo.erl
@@ -7,7 +7,7 @@
-export([websocket_info/3]).
init(Req, _) ->
- {ws, Req, undefined}.
+ {cowboy_websocket, Req, undefined}.
websocket_handle({text, Data}, Req, State) ->
{reply, {text, Data}, Req, State};
diff --git a/test/ws_SUITE_data/ws_echo_timer.erl b/test/ws_SUITE_data/ws_echo_timer.erl
index 199f02c..a26c332 100644
--- a/test/ws_SUITE_data/ws_echo_timer.erl
+++ b/test/ws_SUITE_data/ws_echo_timer.erl
@@ -8,7 +8,7 @@
init(Req, _) ->
erlang:start_timer(1000, self(), <<"websocket_init">>),
- {ws, Req, undefined}.
+ {cowboy_websocket, Req, undefined}.
websocket_handle({text, Data}, Req, State) ->
{reply, {text, Data}, Req, State};
diff --git a/test/ws_SUITE_data/ws_init_shutdown.erl b/test/ws_SUITE_data/ws_init_shutdown.erl
index 68f96f0..7bce03b 100644
--- a/test/ws_SUITE_data/ws_init_shutdown.erl
+++ b/test/ws_SUITE_data/ws_init_shutdown.erl
@@ -4,5 +4,5 @@
-export([init/2]).
-init(Req, _) ->
- {shutdown, cowboy_req:reply(403, Req), undefined}.
+init(Req, Opts) ->
+ {ok, cowboy_req:reply(403, Req), Opts}.
diff --git a/test/ws_SUITE_data/ws_send_many.erl b/test/ws_SUITE_data/ws_send_many.erl
index 2da82c3..6585ffa 100644
--- a/test/ws_SUITE_data/ws_send_many.erl
+++ b/test/ws_SUITE_data/ws_send_many.erl
@@ -8,7 +8,7 @@
init(Req, Opts) ->
erlang:send_after(10, self(), send_many),
- {ws, Req, Opts}.
+ {cowboy_websocket, Req, Opts}.
websocket_handle(_Frame, Req, State) ->
{ok, Req, State}.
diff --git a/test/ws_SUITE_data/ws_timeout_cancel.erl b/test/ws_SUITE_data/ws_timeout_cancel.erl
index 6fcfc43..7376140 100644
--- a/test/ws_SUITE_data/ws_timeout_cancel.erl
+++ b/test/ws_SUITE_data/ws_timeout_cancel.erl
@@ -8,7 +8,7 @@
init(Req, _) ->
erlang:start_timer(500, self(), should_not_cancel_timer),
- {ws, Req, undefined, 1000}.
+ {cowboy_websocket, Req, undefined, 1000}.
websocket_handle({text, Data}, Req, State) ->
{reply, {text, Data}, Req, State};
diff --git a/test/ws_SUITE_data/ws_timeout_hibernate.erl b/test/ws_SUITE_data/ws_timeout_hibernate.erl
index da901d7..15cde66 100644
--- a/test/ws_SUITE_data/ws_timeout_hibernate.erl
+++ b/test/ws_SUITE_data/ws_timeout_hibernate.erl
@@ -7,7 +7,7 @@
-export([websocket_info/3]).
init(Req, _) ->
- {ws, Req, undefined, 1000, hibernate}.
+ {cowboy_websocket, Req, undefined, 1000, hibernate}.
websocket_handle(_Frame, Req, State) ->
{ok, Req, State, hibernate}.