diff options
| author | lain <lain@soykaf.club> | 2020-05-07 14:45:20 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-07 14:45:20 +0200 |
| commit | f0c22df2265e922a66ca69c3508fe812b8e20b6b (patch) | |
| tree | be510abc9cc9154e07b2ec9eaf344e6e4e88bed1 /test/integration | |
| parent | 92caae592338a3ca307686e7644f2de18bb57ce5 (diff) | |
| parent | 4c92dfb73ef1f40438adf5da009499205a677912 (diff) | |
| download | pleroma-f0c22df2265e922a66ca69c3508fe812b8e20b6b.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
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 |