summaryrefslogtreecommitdiff
path: root/test/integration/mastodon_websocket_test.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-05-08 08:51:09 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-05-08 08:51:09 +0300
commitb078e0567dbecc768f88d991a2565141eb9e8c50 (patch)
treeed376fc3c17c6e508ac91d8e72cddad128c07c69 /test/integration/mastodon_websocket_test.exs
parentbd261309cc27ebf5d2f78ea3c1474fe71ae8046d (diff)
parent769d95644daf07bf27fb483e91d0e793eaa18bd8 (diff)
downloadpleroma-b078e0567dbecc768f88d991a2565141eb9e8c50.tar.gz
pleroma-b078e0567dbecc768f88d991a2565141eb9e8c50.zip
Merge branch 'develop' into issue/1276-2
Diffstat (limited to 'test/integration/mastodon_websocket_test.exs')
-rw-r--r--test/integration/mastodon_websocket_test.exs7
1 files changed, 2 insertions, 5 deletions
diff --git a/test/integration/mastodon_websocket_test.exs b/test/integration/mastodon_websocket_test.exs
index bd229c55f..109c7b4cb 100644
--- a/test/integration/mastodon_websocket_test.exs
+++ b/test/integration/mastodon_websocket_test.exs
@@ -12,17 +12,14 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.OAuth
+ @moduletag needs_streamer: true, capture_log: true
+
@path Pleroma.Web.Endpoint.url()
|> URI.parse()
|> Map.put(:scheme, "ws")
|> Map.put(:path, "/api/v1/streaming")
|> URI.to_string()
- setup_all do
- start_supervised(Pleroma.Web.Streamer.supervisor())
- :ok
- end
-
def start_socket(qs \\ nil, headers \\ []) do
path =
case qs do