diff options
| author | lain <lain@soykaf.club> | 2020-05-07 09:13:32 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-07 09:13:32 +0000 |
| commit | 40618418460a35ea5a13c36df594d11297a7ebc6 (patch) | |
| tree | 8e9f12f7d029b1302fbfa079a5c07bef87b054b4 /test/integration | |
| parent | f4c2bf0985f3d65d9caa6f02a71c89db9f070fb1 (diff) | |
| parent | 9491ba3e49450e80cd1c21358c01e4e06e3d881d (diff) | |
| download | pleroma-40618418460a35ea5a13c36df594d11297a7ebc6.tar.gz | |
Merge branch 'streamer-worker-registry' into 'develop'
Streamer rework
See merge request pleroma/pleroma!2426
Diffstat (limited to 'test/integration')
| -rw-r--r-- | test/integration/mastodon_websocket_test.exs | 7 |
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 |