diff options
| author | lain <lain@soykaf.club> | 2020-05-07 15:03:12 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-07 15:03:12 +0200 |
| commit | 7ac0cffb34567dd72877e13968a10d206f643ad8 (patch) | |
| tree | 061fbd748a1b62ddd0555dcb257c39ff5f2ce48a /test/integration/mastodon_websocket_test.exs | |
| parent | db55dc944581b1d4b50d1608b2e991050ea29bb3 (diff) | |
| parent | b7635bf2b6c5251ffc8f3b3b8e1bc7ee9db83b7e (diff) | |
| download | pleroma-7ac0cffb34567dd72877e13968a10d206f643ad8.tar.gz pleroma-7ac0cffb34567dd72877e13968a10d206f643ad8.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
Diffstat (limited to 'test/integration/mastodon_websocket_test.exs')
| -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 |